# HG changeset patch
# User lana
# Date 1363131498 25200
# Node ID 05386b4610e9f9af6c7baae9d5a8d913f52a4f52
# Parent  2a00aeeb466b9dee22508f6261f63b70f9c696fe# Parent  67ef27b4e16cd8abfb5b88781580c4e9cdea561c
Merge

diff -r 2a00aeeb466b -r 05386b4610e9 src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java
--- a/src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java	Thu Mar 07 11:17:32 2013 -0800
+++ b/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);
                 }