Mercurial > hg > openjdk > jdk8 > corba
changeset 441:05386b4610e9
Merge
author | lana |
---|---|
date | Tue, 12 Mar 2013 16:38:18 -0700 |
parents | 2a00aeeb466b (current diff) 67ef27b4e16c (diff) |
children | 7341134e52ff |
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 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); }