# HG changeset patch # User dmeetry # Date 1360878576 -14400 # Node ID 45b3203e35ed2e3897274563162af1230c5e2070 # Parent d17eb2e13e362085e866d46235314c50cc4661cc 7199858: Marshal exception is wrong Reviewed-by: lancea diff -r d17eb2e13e36 -r 45b3203e35ed corba/src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java --- a/corba/src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java Wed Jul 05 18:40:20 2017 +0200 +++ b/corba/src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java Fri Feb 15 01:49:36 2013 +0400 @@ -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); }