OpenJDK / icedtea / jdk7 / corba
changeset 615:98abbee5dd5e
7199858: Marshal exception is wrong
Reviewed-by: lancea
author | dmeetry |
---|---|
date | Tue, 12 Mar 2013 21:56:22 +0400 |
parents | 8b8eada4ad76 |
children | 07408c9598d3 |
files | src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java |
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 Tue Mar 05 16:50:53 2013 -0800 +++ b/src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java Tue Mar 12 21:56:22 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); }