Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #251 by patching glassfish-corba #253

Merged
merged 1 commit into from
Apr 18, 2015
Merged

Conversation

smillidge
Copy link
Contributor

For the record the diff from glassfish-corba-orb 4.0.1 is;

diff -r 5541165fd78e orbmain/src/main/java/com/sun/corba/ee/impl/encoding/CDRInputStream_1_0.java
--- a/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/CDRInputStream_1_0.java  Fri Mar 20 09:34:40 2015 -0400
+++ b/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/CDRInputStream_1_0.java  Sat Apr 18 08:28:48 2015 +0100
@@ -144,7 +144,6 @@
     private static final OMGSystemException omgWrapper = OMGSystemException.self;
     private static final String K_READ_METHOD = "read";
     private static final int MAX_BLOCK_LENGTH = 0x7fffff00;
-    protected static final String EMPTY_STRING = "";

     protected BufferManagerRead bufferManagerRead;
     protected ByteBuffer byteBuffer;
@@ -497,7 +496,7 @@
         // zero to mean empty string.
         //
         if (len == 0) {
-            return EMPTY_STRING;
+            return new String("");
         }

         char[] result = getConvertedChars(len - 1, getCharConverter());
@@ -516,8 +515,8 @@
         // zero to mean empty string.
         //
         if (len == 0) {
-            return EMPTY_STRING;
-        }
+            return new String("");
+       }

         len--;
         char[] c = new char[len];
@@ -567,7 +566,7 @@
         // zero to mean empty string.
         //
         if (len == 0) {
-            return EMPTY_STRING;
+            return new String("");
         }

         checkForNegativeLength(len);
diff -r 5541165fd78e orbmain/src/main/java/com/sun/corba/ee/impl/encoding/CDRInputStream_1_1.java
--- a/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/CDRInputStream_1_1.java  Fri Mar 20 09:34:40 2015 -0400
+++ b/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/CDRInputStream_1_1.java  Sat Apr 18 08:28:48 2015 +0100
@@ -184,7 +184,7 @@
         // zero to mean empty string.
         //
         if (len == 0)
-            return EMPTY_STRING;
+            return new String("");

         checkForNegativeLength(len);

diff -r 5541165fd78e orbmain/src/main/java/com/sun/corba/ee/impl/encoding/CDRInputStream_1_2.java
--- a/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/CDRInputStream_1_2.java  Fri Mar 20 09:34:40 2015 -0400
+++ b/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/CDRInputStream_1_2.java  Sat Apr 18 08:28:48 2015 +0100
@@ -160,7 +160,7 @@
         int len = read_long();

         if (len == 0)
-            return EMPTY_STRING;
+            return new String("");

         checkForNegativeLength(len);

smillidge added a commit that referenced this pull request Apr 18, 2015
Fix #251 by patching glassfish-corba
@smillidge smillidge merged commit 37e173d into payara:master Apr 18, 2015
Cousjava pushed a commit to Cousjava/Payara that referenced this pull request Jan 27, 2021
FISH-651 Added proprietary property to disable verification of token's "typ" c...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant