diff options
Diffstat (limited to 'libjava/classpath/org/omg/CosNaming')
18 files changed, 116 insertions, 236 deletions
diff --git a/libjava/classpath/org/omg/CosNaming/BindingHelper.java b/libjava/classpath/org/omg/CosNaming/BindingHelper.java index b5b42077218..86b0770162a 100644 --- a/libjava/classpath/org/omg/CosNaming/BindingHelper.java +++ b/libjava/classpath/org/omg/CosNaming/BindingHelper.java @@ -39,6 +39,7 @@ exception statement from your version. */ package org.omg.CosNaming; import gnu.CORBA.Minor; +import gnu.CORBA.OrbRestricted; import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; @@ -61,11 +62,6 @@ public abstract class BindingHelper private static String _id = "IDL:omg.org/CosNaming/Binding:1.0"; /** - * The cached type code value. - */ - private static TypeCode typeCode; - - /** * Extract the binding from the given {@link Any}. */ public static Binding extract(Any a) @@ -115,21 +111,17 @@ public abstract class BindingHelper */ public static TypeCode type() { - if (typeCode == null) - { - ORB orb = ORB.init(); - - StructMember[] members = new StructMember[ 2 ]; - TypeCode member; - member = NameComponentHelper.type(); - member = orb.create_sequence_tc(0, member); - member = orb.create_alias_tc(NameHelper.id(), "Name", member); - members [ 0 ] = new StructMember("binding_name", member, null); - member = BindingTypeHelper.type(); - members [ 1 ] = new StructMember("binding_type", member, null); - typeCode = orb.create_struct_tc(id(), "Binding", members); - } - return typeCode; + ORB orb = OrbRestricted.Singleton; + + StructMember[] members = new StructMember[ 2 ]; + TypeCode member; + member = NameComponentHelper.type(); + member = orb.create_sequence_tc(0, member); + member = orb.create_alias_tc(NameHelper.id(), "Name", member); + members [ 0 ] = new StructMember("binding_name", member, null); + member = BindingTypeHelper.type(); + members [ 1 ] = new StructMember("binding_type", member, null); + return orb.create_struct_tc(id(), "Binding", members); } /** diff --git a/libjava/classpath/org/omg/CosNaming/BindingIteratorHelper.java b/libjava/classpath/org/omg/CosNaming/BindingIteratorHelper.java index 64f7b4dfa51..cb17d5748b3 100644 --- a/libjava/classpath/org/omg/CosNaming/BindingIteratorHelper.java +++ b/libjava/classpath/org/omg/CosNaming/BindingIteratorHelper.java @@ -39,6 +39,7 @@ exception statement from your version. */ package org.omg.CosNaming; import gnu.CORBA.Minor; +import gnu.CORBA.OrbRestricted; import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; @@ -63,11 +64,6 @@ public abstract class BindingIteratorHelper private static String _id = "IDL:omg.org/CosNaming/BindingIterator:1.0"; /** - * The cached type code value. - */ - private static TypeCode typeCode = null; - - /** * Extract the binding iterator from the given {@link Any}. */ public static BindingIterator extract(Any a) @@ -167,9 +163,7 @@ public abstract class BindingIteratorHelper */ public static TypeCode type() { - if (typeCode == null) - typeCode = ORB.init().create_interface_tc(id(), "BindingIterator"); - return typeCode; + return OrbRestricted.Singleton.create_interface_tc(id(), "BindingIterator"); } /** diff --git a/libjava/classpath/org/omg/CosNaming/BindingListHelper.java b/libjava/classpath/org/omg/CosNaming/BindingListHelper.java index 44fe39dcad2..de04989e0b4 100644 --- a/libjava/classpath/org/omg/CosNaming/BindingListHelper.java +++ b/libjava/classpath/org/omg/CosNaming/BindingListHelper.java @@ -38,6 +38,8 @@ exception statement from your version. */ package org.omg.CosNaming; +import gnu.CORBA.OrbRestricted; + import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; import org.omg.CORBA.ORB; @@ -58,11 +60,6 @@ public abstract class BindingListHelper private static String _id = "IDL:omg.org/CosNaming/BindingList:1.0"; /** - * The cached binding list type code. - */ - private static TypeCode typeCode; - - /** * Extract the array of bindings from the given {@link Any}. */ public static Binding[] extract(Any a) @@ -112,13 +109,11 @@ public abstract class BindingListHelper */ public static TypeCode type() { - if (typeCode == null) - { - ORB orb = ORB.init(); - typeCode = BindingHelper.type(); - typeCode = orb.create_sequence_tc(0, typeCode); - typeCode = orb.create_alias_tc(id(), "BindingList", typeCode); - } + TypeCode typeCode; + ORB orb = OrbRestricted.Singleton; + typeCode = BindingHelper.type(); + typeCode = orb.create_sequence_tc(0, typeCode); + typeCode = orb.create_alias_tc(id(), "BindingList", typeCode); return typeCode; } diff --git a/libjava/classpath/org/omg/CosNaming/BindingTypeHelper.java b/libjava/classpath/org/omg/CosNaming/BindingTypeHelper.java index 2f0dc71c4ef..8f456ee70da 100644 --- a/libjava/classpath/org/omg/CosNaming/BindingTypeHelper.java +++ b/libjava/classpath/org/omg/CosNaming/BindingTypeHelper.java @@ -39,6 +39,7 @@ exception statement from your version. */ package org.omg.CosNaming; import gnu.CORBA.Minor; +import gnu.CORBA.OrbRestricted; import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; @@ -58,8 +59,6 @@ public abstract class BindingTypeHelper * The binding type repository id. */ private static String id = "IDL:omg.org/CosNaming/BindingType:1.0"; - private static TypeCode typeCode = null; - /** * Extract the binding type from the given {@link Any}. */ @@ -105,16 +104,10 @@ public abstract class BindingTypeHelper /** * Get the type code of this enumeration. */ - public static synchronized TypeCode type() + public static TypeCode type() { - if (typeCode == null) - { - typeCode = - ORB.init().create_enum_tc(id(), "BindingType", - new String[] { "nobject", "ncontext" } - ); - } - return typeCode; + return OrbRestricted.Singleton.create_enum_tc(id(), "BindingType", + new String[] { "nobject", "ncontext" }); } /** diff --git a/libjava/classpath/org/omg/CosNaming/NameComponentHelper.java b/libjava/classpath/org/omg/CosNaming/NameComponentHelper.java index 8499edfe66e..8127aa01d9c 100644 --- a/libjava/classpath/org/omg/CosNaming/NameComponentHelper.java +++ b/libjava/classpath/org/omg/CosNaming/NameComponentHelper.java @@ -39,6 +39,7 @@ exception statement from your version. */ package org.omg.CosNaming; import gnu.CORBA.Minor; +import gnu.CORBA.OrbRestricted; import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; @@ -61,11 +62,6 @@ public abstract class NameComponentHelper private static String _id = "IDL:omg.org/CosNaming/NameComponent:1.0"; /** - * The cached type code. - */ - private static TypeCode typeCode = null; - - /** * Extract the name component from this {@link Any} */ public static NameComponent extract(Any a) @@ -116,22 +112,18 @@ public abstract class NameComponentHelper */ public static TypeCode type() { - if (typeCode == null) - { - ORB orb = ORB.init(); - - StructMember[] members = new StructMember[ 2 ]; - TypeCode member; - member = orb.create_string_tc(0); - members [ 0 ] = new StructMember("id", member, null); - member = orb.create_string_tc(0); - members [ 1 ] = new StructMember("kind", member, null); - typeCode = - orb.create_struct_tc(NameComponentHelper.id(), "NameComponent", - members - ); - } - return typeCode; + ORB orb = OrbRestricted.Singleton; + + StructMember[] members = new StructMember[ 2 ]; + TypeCode member; + member = orb.create_string_tc(0); + members [ 0 ] = new StructMember("id", member, null); + member = orb.create_string_tc(0); + members [ 1 ] = new StructMember("kind", member, null); + return + orb.create_struct_tc(NameComponentHelper.id(), "NameComponent", + members + ); } /** diff --git a/libjava/classpath/org/omg/CosNaming/NameHelper.java b/libjava/classpath/org/omg/CosNaming/NameHelper.java index 18faf31823b..f66fa4f099d 100644 --- a/libjava/classpath/org/omg/CosNaming/NameHelper.java +++ b/libjava/classpath/org/omg/CosNaming/NameHelper.java @@ -39,6 +39,7 @@ exception statement from your version. */ package org.omg.CosNaming; import gnu.CORBA.Minor; +import gnu.CORBA.OrbRestricted; import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; @@ -62,11 +63,6 @@ public abstract class NameHelper private static String _id = "IDL:omg.org/CosNaming/Name:1.0"; /** - * The cached typecode of the Name. - */ - private static TypeCode typeCode; - - /** * Extract the Name the given {@link Any}. */ public static NameComponent[] extract(Any a) @@ -118,13 +114,11 @@ public abstract class NameHelper */ public static TypeCode type() { - if (typeCode == null) - { - typeCode = NameComponentHelper.type(); - typeCode = ORB.init().create_sequence_tc(0, typeCode); - typeCode = - ORB.init().create_alias_tc(NameHelper.id(), "Name", typeCode); - } + TypeCode typeCode; + typeCode = NameComponentHelper.type(); + typeCode = OrbRestricted.Singleton.create_sequence_tc(0, typeCode); + typeCode = + OrbRestricted.Singleton.create_alias_tc(NameHelper.id(), "Name", typeCode); return typeCode; } diff --git a/libjava/classpath/org/omg/CosNaming/NamingContextExtHelper.java b/libjava/classpath/org/omg/CosNaming/NamingContextExtHelper.java index 86bf8c55dfd..aca0e9dfd23 100644 --- a/libjava/classpath/org/omg/CosNaming/NamingContextExtHelper.java +++ b/libjava/classpath/org/omg/CosNaming/NamingContextExtHelper.java @@ -39,6 +39,7 @@ exception statement from your version. */ package org.omg.CosNaming; import gnu.CORBA.Minor; +import gnu.CORBA.OrbRestricted; import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; @@ -63,11 +64,6 @@ public abstract class NamingContextExtHelper private static String _id = "IDL:omg.org/CosNaming/NamingContextExt:1.0"; /** - * The cached {@link NamingContextExt} typecode. - */ - private static TypeCode typeCode = null; - - /** * Extract the naming context from the given {@link Any}. */ public static NamingContextExt extract(Any a) @@ -168,12 +164,8 @@ public abstract class NamingContextExtHelper */ public static TypeCode type() { - if (typeCode == null) - typeCode = - ORB.init().create_interface_tc(NamingContextExtHelper.id(), - "NamingContextExt" - ); - return typeCode; + return OrbRestricted.Singleton.create_interface_tc(NamingContextExtHelper.id(), + "NamingContextExt"); } /** diff --git a/libjava/classpath/org/omg/CosNaming/NamingContextExtPackage/AddressHelper.java b/libjava/classpath/org/omg/CosNaming/NamingContextExtPackage/AddressHelper.java index cf4029ccfc8..81046074416 100644 --- a/libjava/classpath/org/omg/CosNaming/NamingContextExtPackage/AddressHelper.java +++ b/libjava/classpath/org/omg/CosNaming/NamingContextExtPackage/AddressHelper.java @@ -38,6 +38,8 @@ exception statement from your version. */ package org.omg.CosNaming.NamingContextExtPackage; +import gnu.CORBA.OrbRestricted; + import org.omg.CORBA.Any; import org.omg.CORBA.ORB; import org.omg.CORBA.TypeCode; @@ -60,11 +62,6 @@ public abstract class AddressHelper "IDL:omg.org/CosNaming/NamingContextExt/Address:1.0"; /** - * The cached type code (string alias). - */ - private static TypeCode typeCode = null; - - /** * Just extracts string from this {@link Any}. */ public static String extract(Any a) @@ -99,13 +96,12 @@ public abstract class AddressHelper /** * Return the "Address", alias of String, typecode. */ - public static synchronized TypeCode type() + public static TypeCode type() { - if (typeCode == null) - { - typeCode = ORB.init().create_string_tc(0); - typeCode = ORB.init().create_alias_tc(id(), "Address", typeCode); - } + ORB orb = OrbRestricted.Singleton; + TypeCode typeCode; + typeCode = orb.create_string_tc(0); + typeCode = orb.create_alias_tc(id(), "Address", typeCode); return typeCode; } diff --git a/libjava/classpath/org/omg/CosNaming/NamingContextExtPackage/InvalidAddressHelper.java b/libjava/classpath/org/omg/CosNaming/NamingContextExtPackage/InvalidAddressHelper.java index 02f8fccb607..c7f3849a0c1 100644 --- a/libjava/classpath/org/omg/CosNaming/NamingContextExtPackage/InvalidAddressHelper.java +++ b/libjava/classpath/org/omg/CosNaming/NamingContextExtPackage/InvalidAddressHelper.java @@ -38,6 +38,8 @@ exception statement from your version. */ package org.omg.CosNaming.NamingContextExtPackage; +import gnu.CORBA.OrbRestricted; + import org.omg.CORBA.Any; import org.omg.CORBA.ORB; import org.omg.CORBA.StructMember; @@ -59,11 +61,6 @@ public abstract class InvalidAddressHelper "IDL:omg.org/CosNaming/NamingContextExt/InvalidAddress:1.0"; /** - * The cached type code value. - */ - private static TypeCode typeCode; - - /** * Extract the exception from the given {@link Any}. */ public static InvalidAddress extract(Any a) @@ -102,16 +99,10 @@ public abstract class InvalidAddressHelper /** * Create the type code for this exception. */ - public static synchronized TypeCode type() + public static TypeCode type() { - if (typeCode == null) - { - typeCode = - ORB.init().create_struct_tc(InvalidAddressHelper.id(), - "InvalidAddress", new StructMember[ 0 ] - ); - } - return typeCode; + return OrbRestricted.Singleton.create_struct_tc(InvalidAddressHelper.id(), + "InvalidAddress", new StructMember[0]); } public static void write(OutputStream ostream, InvalidAddress value) diff --git a/libjava/classpath/org/omg/CosNaming/NamingContextExtPackage/StringNameHelper.java b/libjava/classpath/org/omg/CosNaming/NamingContextExtPackage/StringNameHelper.java index 24c69fcb9b2..06faa2ff940 100644 --- a/libjava/classpath/org/omg/CosNaming/NamingContextExtPackage/StringNameHelper.java +++ b/libjava/classpath/org/omg/CosNaming/NamingContextExtPackage/StringNameHelper.java @@ -38,6 +38,8 @@ exception statement from your version. */ package org.omg.CosNaming.NamingContextExtPackage; +import gnu.CORBA.OrbRestricted; + import org.omg.CORBA.Any; import org.omg.CORBA.ORB; import org.omg.CORBA.TypeCode; @@ -61,11 +63,6 @@ public abstract class StringNameHelper "IDL:omg.org/CosNaming/NamingContextExt/StringName:1.0"; /** - * The cached type code (string alias). - */ - private static TypeCode typeCode; - - /** * Just extracts string from this {@link Any}. */ public static String extract(Any a) @@ -100,13 +97,11 @@ public abstract class StringNameHelper /** * Return the "StringName", alias of String, typecode. */ - public static synchronized TypeCode type() + public static TypeCode type() { - if (typeCode == null) - { - typeCode = ORB.init().create_string_tc(0); - typeCode = ORB.init().create_alias_tc(id(), "StringName", typeCode); - } + TypeCode typeCode; + typeCode = OrbRestricted.Singleton.create_string_tc(0); + typeCode = OrbRestricted.Singleton.create_alias_tc(id(), "StringName", typeCode); return typeCode; } diff --git a/libjava/classpath/org/omg/CosNaming/NamingContextExtPackage/URLStringHelper.java b/libjava/classpath/org/omg/CosNaming/NamingContextExtPackage/URLStringHelper.java index 503fe22d69a..173bb989eb7 100644 --- a/libjava/classpath/org/omg/CosNaming/NamingContextExtPackage/URLStringHelper.java +++ b/libjava/classpath/org/omg/CosNaming/NamingContextExtPackage/URLStringHelper.java @@ -38,6 +38,8 @@ exception statement from your version. */ package org.omg.CosNaming.NamingContextExtPackage; +import gnu.CORBA.OrbRestricted; + import org.omg.CORBA.Any; import org.omg.CORBA.ORB; import org.omg.CORBA.TypeCode; @@ -60,11 +62,6 @@ public abstract class URLStringHelper "IDL:omg.org/CosNaming/NamingContextExt/URLString:1.0"; /** - * The cached type code (string alias). - */ - private static TypeCode typeCode; - - /** * Just extracts string from this {@link Any}. */ public static String extract(Any a) @@ -99,13 +96,11 @@ public abstract class URLStringHelper /** * Return the "URLString", alias of String, typecode. */ - public static synchronized TypeCode type() + public static TypeCode type() { - if (typeCode == null) - { - typeCode = ORB.init().create_string_tc(0); - typeCode = ORB.init().create_alias_tc(id(), "URLString", typeCode); - } + TypeCode typeCode; + typeCode = OrbRestricted.Singleton.create_string_tc(0); + typeCode = OrbRestricted.Singleton.create_alias_tc(id(), "URLString", typeCode); return typeCode; } diff --git a/libjava/classpath/org/omg/CosNaming/NamingContextHelper.java b/libjava/classpath/org/omg/CosNaming/NamingContextHelper.java index fb9b091a6a0..48b90c25ab0 100644 --- a/libjava/classpath/org/omg/CosNaming/NamingContextHelper.java +++ b/libjava/classpath/org/omg/CosNaming/NamingContextHelper.java @@ -39,6 +39,7 @@ exception statement from your version. */ package org.omg.CosNaming; import gnu.CORBA.Minor; +import gnu.CORBA.OrbRestricted; import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; @@ -63,11 +64,6 @@ public abstract class NamingContextHelper private static String _id = "IDL:omg.org/CosNaming/NamingContext:1.0"; /** - * The cached {@link NamingContext} typecode. - */ - private static TypeCode typeCode; - - /** * Extract the naming context from the given {@link Any}. */ public static NamingContext extract(Any a) @@ -176,9 +172,7 @@ public abstract class NamingContextHelper */ public static TypeCode type() { - if (typeCode == null) - typeCode = ORB.init().create_interface_tc(id(), "NamingContext"); - return typeCode; + return OrbRestricted.Singleton.create_interface_tc(id(), "NamingContext"); } /** diff --git a/libjava/classpath/org/omg/CosNaming/NamingContextPackage/AlreadyBoundHelper.java b/libjava/classpath/org/omg/CosNaming/NamingContextPackage/AlreadyBoundHelper.java index 6bf7bd7a6b3..f43111cb20b 100644 --- a/libjava/classpath/org/omg/CosNaming/NamingContextPackage/AlreadyBoundHelper.java +++ b/libjava/classpath/org/omg/CosNaming/NamingContextPackage/AlreadyBoundHelper.java @@ -39,6 +39,7 @@ exception statement from your version. */ package org.omg.CosNaming.NamingContextPackage; import gnu.CORBA.Minor; +import gnu.CORBA.OrbRestricted; import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; @@ -62,11 +63,6 @@ public abstract class AlreadyBoundHelper "IDL:omg.org/CosNaming/NamingContext/AlreadyBound:1.0"; /** - * The cached type code value. - */ - private static TypeCode typeCode; - - /** * Extract the exception from the given {@link Any}. */ public static AlreadyBound extract(Any a) @@ -117,10 +113,8 @@ public abstract class AlreadyBoundHelper */ public static TypeCode type() { - if (typeCode == null) - typeCode = - ORB.init().create_struct_tc(id(), "AlreadyBound", new StructMember[ 0 ]); - return typeCode; + return + OrbRestricted.Singleton.create_struct_tc(id(), "AlreadyBound", new StructMember[ 0 ]); } /** diff --git a/libjava/classpath/org/omg/CosNaming/NamingContextPackage/CannotProceedHelper.java b/libjava/classpath/org/omg/CosNaming/NamingContextPackage/CannotProceedHelper.java index 1d0b6049b66..85e391cf8c3 100644 --- a/libjava/classpath/org/omg/CosNaming/NamingContextPackage/CannotProceedHelper.java +++ b/libjava/classpath/org/omg/CosNaming/NamingContextPackage/CannotProceedHelper.java @@ -39,6 +39,7 @@ exception statement from your version. */ package org.omg.CosNaming.NamingContextPackage; import gnu.CORBA.Minor; +import gnu.CORBA.OrbRestricted; import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; @@ -65,11 +66,6 @@ public abstract class CannotProceedHelper "IDL:omg.org/CosNaming/NamingContext/CannotProceed:1.0"; /** - * The cached type code value. - */ - private static TypeCode typeCode; - - /** * Extract the exception from the given {@link Any}. */ public static CannotProceed extract(Any a) @@ -122,21 +118,17 @@ public abstract class CannotProceedHelper */ public static TypeCode type() { - if (typeCode == null) - { - ORB orb = ORB.init(); - - StructMember[] members = new StructMember[ 2 ]; - TypeCode member; - member = NamingContextHelper.type(); - members [ 0 ] = new StructMember("cxt", member, null); - member = NameComponentHelper.type(); - member = orb.create_sequence_tc(0, member); - member = orb.create_alias_tc(NameHelper.id(), "Name", member); - members [ 1 ] = new StructMember("rest_of_name", member, null); - typeCode = orb.create_struct_tc(id(), "CannotProceed", members); - } - return typeCode; + ORB orb = OrbRestricted.Singleton; + + StructMember[] members = new StructMember[ 2 ]; + TypeCode member; + member = NamingContextHelper.type(); + members [ 0 ] = new StructMember("cxt", member, null); + member = NameComponentHelper.type(); + member = orb.create_sequence_tc(0, member); + member = orb.create_alias_tc(NameHelper.id(), "Name", member); + members [ 1 ] = new StructMember("rest_of_name", member, null); + return orb.create_struct_tc(id(), "CannotProceed", members); } /** diff --git a/libjava/classpath/org/omg/CosNaming/NamingContextPackage/InvalidNameHelper.java b/libjava/classpath/org/omg/CosNaming/NamingContextPackage/InvalidNameHelper.java index 8f1133602d7..5893332b804 100644 --- a/libjava/classpath/org/omg/CosNaming/NamingContextPackage/InvalidNameHelper.java +++ b/libjava/classpath/org/omg/CosNaming/NamingContextPackage/InvalidNameHelper.java @@ -39,6 +39,7 @@ exception statement from your version. */ package org.omg.CosNaming.NamingContextPackage; import gnu.CORBA.Minor; +import gnu.CORBA.OrbRestricted; import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; @@ -62,11 +63,6 @@ public abstract class InvalidNameHelper "IDL:omg.org/CosNaming/NamingContext/InvalidName:1.0"; /** - * The cached type code value. - */ - private static TypeCode typeCode; - - /** * Extract the exception from the given {@link Any}. */ public static InvalidName extract(Any a) @@ -117,15 +113,8 @@ public abstract class InvalidNameHelper */ public static TypeCode type() { - if (typeCode == null) - { - if (typeCode == null) - typeCode = - ORB.init().create_struct_tc(id(), "InvalidName", - new StructMember[ 0 ] - ); - } - return typeCode; + return OrbRestricted.Singleton.create_struct_tc(id(), + "InvalidName", new StructMember[0]); } /** diff --git a/libjava/classpath/org/omg/CosNaming/NamingContextPackage/NotEmptyHelper.java b/libjava/classpath/org/omg/CosNaming/NamingContextPackage/NotEmptyHelper.java index 6333dfcbcd3..a9b802f9549 100644 --- a/libjava/classpath/org/omg/CosNaming/NamingContextPackage/NotEmptyHelper.java +++ b/libjava/classpath/org/omg/CosNaming/NamingContextPackage/NotEmptyHelper.java @@ -39,6 +39,7 @@ exception statement from your version. */ package org.omg.CosNaming.NamingContextPackage; import gnu.CORBA.Minor; +import gnu.CORBA.OrbRestricted; import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; @@ -62,11 +63,6 @@ public abstract class NotEmptyHelper "IDL:omg.org/CosNaming/NamingContext/NotEmpty:1.0"; /** - * The cached type code value. - */ - private static TypeCode typeCode; - - /** * Extract the exception from the given {@link Any}. */ public static NotEmpty extract(Any a) @@ -117,10 +113,8 @@ public abstract class NotEmptyHelper */ public static TypeCode type() { - if (typeCode == null) - typeCode = - ORB.init().create_struct_tc(id(), "NotEmpty", new StructMember[ 0 ]); - return typeCode; + return OrbRestricted.Singleton.create_struct_tc(id(), + "NotEmpty", new StructMember[0]); } /** diff --git a/libjava/classpath/org/omg/CosNaming/NamingContextPackage/NotFoundHelper.java b/libjava/classpath/org/omg/CosNaming/NamingContextPackage/NotFoundHelper.java index 442b7db9e63..0be9b75bc0b 100644 --- a/libjava/classpath/org/omg/CosNaming/NamingContextPackage/NotFoundHelper.java +++ b/libjava/classpath/org/omg/CosNaming/NamingContextPackage/NotFoundHelper.java @@ -39,6 +39,7 @@ exception statement from your version. */ package org.omg.CosNaming.NamingContextPackage; import gnu.CORBA.Minor; +import gnu.CORBA.OrbRestricted; import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; @@ -64,11 +65,6 @@ public abstract class NotFoundHelper "IDL:omg.org/CosNaming/NamingContext/NotFound:1.0"; /** - * The cached type code value. - */ - private static TypeCode typeCode = null; - - /** * Extract the exception from the given {@link Any}. */ public static NotFound extract(Any a) @@ -121,21 +117,17 @@ public abstract class NotFoundHelper */ public static TypeCode type() { - if (typeCode == null) - { - ORB orb = ORB.init(); - - StructMember[] members = new StructMember[ 2 ]; - TypeCode member = null; - member = NotFoundReasonHelper.type(); - members [ 0 ] = new StructMember("why", member, null); - member = NameComponentHelper.type(); - member = orb.create_sequence_tc(0, member); - member = orb.create_alias_tc(NameHelper.id(), "Name", member); - members [ 1 ] = new StructMember("rest_of_name", member, null); - typeCode = orb.create_struct_tc(id(), "NotFound", members); - } - return typeCode; + ORB orb = OrbRestricted.Singleton; + + StructMember[] members = new StructMember[ 2 ]; + TypeCode member = null; + member = NotFoundReasonHelper.type(); + members [ 0 ] = new StructMember("why", member, null); + member = NameComponentHelper.type(); + member = orb.create_sequence_tc(0, member); + member = orb.create_alias_tc(NameHelper.id(), "Name", member); + members [ 1 ] = new StructMember("rest_of_name", member, null); + return orb.create_struct_tc(id(), "NotFound", members); } /** diff --git a/libjava/classpath/org/omg/CosNaming/NamingContextPackage/NotFoundReasonHelper.java b/libjava/classpath/org/omg/CosNaming/NamingContextPackage/NotFoundReasonHelper.java index 45a42a0ba70..9d44dcbf383 100644 --- a/libjava/classpath/org/omg/CosNaming/NamingContextPackage/NotFoundReasonHelper.java +++ b/libjava/classpath/org/omg/CosNaming/NamingContextPackage/NotFoundReasonHelper.java @@ -39,6 +39,7 @@ exception statement from your version. */ package org.omg.CosNaming.NamingContextPackage; import gnu.CORBA.Minor; +import gnu.CORBA.OrbRestricted; import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; @@ -61,11 +62,6 @@ public abstract class NotFoundReasonHelper "IDL:omg.org/CosNaming/NamingContext/NotFoundReason:1.0"; /** - * The cached type code value. - */ - private static TypeCode typeCode; - - /** * Extract the exception from the given {@link Any}. */ public static NotFoundReason extract(Any a) @@ -112,15 +108,15 @@ public abstract class NotFoundReasonHelper */ public static TypeCode type() { - if (typeCode == null) - typeCode = - ORB.init().create_enum_tc(id(), "NotFoundReason", - new String[] - { - "missing_node", "not_context", "not_object" - } - ); - return typeCode; + return + OrbRestricted.Singleton.create_enum_tc(id(), "NotFoundReason", + new String[] + { + "missing_node", + "not_context", + "not_object" + } + ); } /** |
