diff options
Diffstat (limited to 'libjava/classpath/org/omg/CORBA/StringValueHelper.java')
| -rw-r--r-- | libjava/classpath/org/omg/CORBA/StringValueHelper.java | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/libjava/classpath/org/omg/CORBA/StringValueHelper.java b/libjava/classpath/org/omg/CORBA/StringValueHelper.java index 97d0e7a5d06..24e79ce571b 100644 --- a/libjava/classpath/org/omg/CORBA/StringValueHelper.java +++ b/libjava/classpath/org/omg/CORBA/StringValueHelper.java @@ -38,10 +38,9 @@ exception statement from your version. */ package org.omg.CORBA; -import gnu.CORBA.Restricted_ORB; -import gnu.CORBA.gnuAny; +import gnu.CORBA.Minor; +import gnu.CORBA.OrbRestricted; -import org.omg.CORBA.TypeCodePackage.BadKind; import org.omg.CORBA.portable.BoxedValueHelper; import org.omg.CORBA.portable.InputStream; import org.omg.CORBA.portable.OutputStream; @@ -75,7 +74,7 @@ public class StringValueHelper * The String typecode. */ private static final TypeCode tString = - Restricted_ORB.Singleton.create_string_tc(0); + OrbRestricted.Singleton.create_string_tc(0); /** * Returns the String Value repository Id. @@ -121,7 +120,9 @@ public class StringValueHelper } catch (ClassCastException ex) { - throw new MARSHAL("String expected"); + MARSHAL m = new MARSHAL("String expected"); + m.minor = Minor.ClassCast; + throw m; } } @@ -141,7 +142,11 @@ public class StringValueHelper return an_any.extract_string(); } else - throw new BAD_OPERATION("Contains not a string value type"); + { + BAD_OPERATION bad = new BAD_OPERATION("String value type expected"); + bad.minor = Minor.Any; + throw bad; + } } /** @@ -177,7 +182,7 @@ public class StringValueHelper { if (typecode == null) { - ORB orb = Restricted_ORB.Singleton; + ORB orb = OrbRestricted.Singleton; typecode = orb.create_value_box_tc(id(), "StringValue", tString); } |