changeset 621:862b43d26e03 jdk7u14-b18

Merge
author lana
date Mon, 25 Mar 2013 10:29:56 -0700
parents 1c57c2f102c5 07408c9598d3
children 04ad0a30f564 bfbaab73969d
files
diffstat 1 files changed, 1 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java	Wed Mar 20 14:47:28 2013 -0700
+++ b/src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java	Mon Mar 25 10:29:56 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);
                 }