# HG changeset patch
# User msheppar
# Date 1436893390 -3600
# Node ID 04eefee2f54b59c76debe37cf98d4cc88bc756e3
# Parent  4d5e1be7047d9b9a999c7060e35776e44b67f858
8076387: Better CORBA value handling
Reviewed-by: rriggs, coffeys, skoivu, ahgross

diff -r 4d5e1be7047d -r 04eefee2f54b corba/src/java.corba/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java	Tue Jul 14 16:49:41 2015 +0100
+++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java	Tue Jul 14 18:03:10 2015 +0100
@@ -1068,6 +1068,9 @@
 
             int spBase = spClass;       // current top of stack
 
+            if (currentClass.getName().equals("java.lang.String")) {
+                return this.readUTF();
+            }
             /* The object's classes should be processed from supertype to subtype
              * Push all the clases of the current object onto a stack.
              * Note that only the serializable classes are represented
diff -r 4d5e1be7047d -r 04eefee2f54b corba/src/java.corba/share/classes/com/sun/corba/se/impl/io/IIOPOutputStream.java
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/io/IIOPOutputStream.java	Tue Jul 14 16:49:41 2015 +0100
+++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/io/IIOPOutputStream.java	Tue Jul 14 18:03:10 2015 +0100
@@ -559,6 +559,10 @@
              * Push all the clases of the current object onto a stack.
              * Remember the stack pointer where this set of classes is being pushed.
              */
+            if (currentClassDesc.forClass().getName().equals("java.lang.String")) {
+                    this.writeUTF((String)obj);
+                    return;
+            }
             int stackMark = classDescStack.size();
             try {
                 ObjectStreamClass next;