Merge
authorlana
Tue, 12 Mar 2013 16:38:18 -0700
changeset 16135 92bf3c68c503
parent 15896 e41d716405b2 (current diff)
parent 16134 ae22dda24476 (diff)
child 16142 bd50168dbacc
Merge
--- a/corba/src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java	Wed Jul 05 18:43:54 2017 +0200
+++ b/corba/src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java	Tue Mar 12 16:38:18 2013 -0700
@@ -2189,10 +2189,7 @@
 
                 if (labelIndex == _unionLabels.length) {
                     // check if label has not been found
-                    if (_defaultIndex == -1)
-                        // throw exception if default was not expected
-                        throw wrapper.unexpectedUnionDefault() ;
-                    else
+                    if (_defaultIndex != -1)
                         // must be of the default branch type
                         _memberTypes[_defaultIndex].copy(src, dst);
                 }