Tue, 14 Jul 2015 18:03:10 +0100
8076387: Better CORBA value handling
Reviewed-by: rriggs, coffeys, skoivu, ahgross
1.1 --- a/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java Tue Jul 14 16:49:41 2015 +0100 1.2 +++ b/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java Tue Jul 14 18:03:10 2015 +0100 1.3 @@ -1068,6 +1068,9 @@ 1.4 1.5 int spBase = spClass; // current top of stack 1.6 1.7 + if (currentClass.getName().equals("java.lang.String")) { 1.8 + return this.readUTF(); 1.9 + } 1.10 /* The object's classes should be processed from supertype to subtype 1.11 * Push all the clases of the current object onto a stack. 1.12 * Note that only the serializable classes are represented
2.1 --- a/src/share/classes/com/sun/corba/se/impl/io/IIOPOutputStream.java Tue Jul 14 16:49:41 2015 +0100 2.2 +++ b/src/share/classes/com/sun/corba/se/impl/io/IIOPOutputStream.java Tue Jul 14 18:03:10 2015 +0100 2.3 @@ -559,6 +559,10 @@ 2.4 * Push all the clases of the current object onto a stack. 2.5 * Remember the stack pointer where this set of classes is being pushed. 2.6 */ 2.7 + if (currentClassDesc.forClass().getName().equals("java.lang.String")) { 2.8 + this.writeUTF((String)obj); 2.9 + return; 2.10 + } 2.11 int stackMark = classDescStack.size(); 2.12 try { 2.13 ObjectStreamClass next;