2006-07-10 Audrius Meskauskas <AudriusA@Bioinformatics.org>

* examples/gnu/classpath/examples/CORBA/SimpleCommunication/ communication/StructureToPassHelper.java, examples/gnu/classpath/examples/CORBA/SimpleCommunication/ communication/StructureToReturnHelper.java, examples/gnu/classpath/examples/CORBA/SimpleCommunication/ communication/TreeNodeHelper.java, examples/gnu/classpath/examples/CORBA/SimpleCommunication/ communication/WeThrowThisExceptionHelper.java, gnu/CORBA/ForwardRequestHelper.java, org/omg/CORBA/CompletionStatusHelper.java, org/omg/CORBA/CurrentHelper.java, org/omg/CORBA/DefinitionKindHelper.java, org/omg/CORBA/IDLTypeHelper.java, org/omg/CORBA/NameValuePairHelper.java, org/omg/CORBA/ObjectHelper.java, org/omg/CORBA/ParameterModeHelper.java, org/omg/CORBA/PolicyErrorCodeHelper.java, org/omg/CORBA/PolicyErrorHelper.java, org/omg/CORBA/PolicyHelper.java, org/omg/CORBA/PolicyListHelper.java, org/omg/CORBA/PolicyTypeHelper.java, org/omg/CORBA/ServiceDetailHelper.java, org/omg/CORBA/ServiceInformationHelper.java, org/omg/CORBA/SetOverrideTypeHelper.java, org/omg/CORBA/StringValueHelper.java, org/omg/CORBA/UnionMemberHelper.java, org/omg/CORBA/UnknownUserExceptionHelper.java, org/omg/CORBA/VisibilityHelper.java, org/omg/CORBA/WStringValueHelper.java, org/omg/CORBA/WrongTransactionHelper.java, org/omg/CosNaming/BindingHelper.java, org/omg/CosNaming/BindingIteratorHelper.java, org/omg/CosNaming/BindingListHelper.java, org/omg/CosNaming/BindingTypeHelper.java, org/omg/CosNaming/NameComponentHelper.java, org/omg/CosNaming/NameHelper.java, org/omg/CosNaming/NamingContextExtHelper.java, org/omg/CosNaming/NamingContextExtPackage/AddressHelper.java, org/omg/CosNaming/NamingContextExtPackage/InvalidAddressHelper.java, org/omg/CosNaming/NamingContextExtPackage/StringNameHelper.java, org/omg/CosNaming/NamingContextExtPackage/URLStringHelper.java, org/omg/CosNaming/NamingContextHelper.java, org/omg/CosNaming/NamingContextPackage/AlreadyBoundHelper.java, org/omg/CosNaming/NamingContextPackage/CannotProceedHelper.java, org/omg/CosNaming/NamingContextPackage/InvalidNameHelper.java, org/omg/CosNaming/NamingContextPackage/NotEmptyHelper.java, org/omg/CosNaming/NamingContextPackage/NotFoundHelper.java, org/omg/CosNaming/NamingContextPackage/NotFoundReasonHelper.java, org/omg/DynamicAny/AnySeqHelper.java, org/omg/DynamicAny/DynAnyFactoryHelper.java, org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCodeHelper.java, org/omg/DynamicAny/DynAnyHelper.java, org/omg/DynamicAny/DynAnyPackage/InvalidValueHelper.java, org/omg/DynamicAny/DynAnyPackage/TypeMismatchHelper.java, org/omg/DynamicAny/DynAnySeqHelper.java, org/omg/DynamicAny/DynArrayHelper.java, org/omg/DynamicAny/DynEnumHelper.java, org/omg/DynamicAny/DynFixedHelper.java, org/omg/DynamicAny/DynSequenceHelper.java, org/omg/DynamicAny/DynStructHelper.java, org/omg/DynamicAny/DynUnionHelper.java, org/omg/DynamicAny/DynValueHelper.java, org/omg/DynamicAny/NameDynAnyPairHelper.java, org/omg/DynamicAny/NameDynAnyPairSeqHelper.java, org/omg/DynamicAny/NameValuePairHelper.java, org/omg/DynamicAny/NameValuePairSeqHelper.java, org/omg/IOP/CodecFactoryHelper.java, org/omg/IOP/CodecFactoryPackage/UnknownEncodingHelper.java, org/omg/IOP/CodecPackage/FormatMismatchHelper.java, org/omg/IOP/CodecPackage/InvalidTypeForEncodingHelper.java, org/omg/IOP/CodecPackage/TypeMismatchHelper.java, org/omg/IOP/ComponentIdHelper.java, org/omg/IOP/IORHelper.java, org/omg/IOP/MultipleComponentProfileHelper.java, org/omg/IOP/ProfileIdHelper.java, org/omg/IOP/ServiceContextHelper.java, org/omg/IOP/ServiceContextListHelper.java, org/omg/IOP/ServiceIdHelper.java, org/omg/IOP/TaggedComponentHelper.java, org/omg/IOP/TaggedProfileHelper.java, org/omg/PortableInterceptor/AdapterManagerIdHelper.java, org/omg/PortableInterceptor/AdapterNameHelper.java, org/omg/PortableInterceptor/AdapterStateHelper.java, org/omg/PortableInterceptor/CurrentHelper.java, org/omg/PortableInterceptor/ForwardRequestHelper.java, org/omg/PortableInterceptor/IORInterceptor_3_0Helper.java, org/omg/PortableInterceptor/InvalidSlotHelper.java, org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateNameHelper.java, org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidNameHelper.java, org/omg/PortableInterceptor/ObjectReferenceFactoryHelper.java, org/omg/PortableInterceptor/ObjectReferenceTemplateHelper.java, org/omg/PortableInterceptor/ObjectReferenceTemplateSeqHelper.java, org/omg/PortableServer/CurrentHelper.java, org/omg/PortableServer/CurrentPackage/NoContextHelper.java, org/omg/PortableServer/ForwardRequestHelper.java, org/omg/PortableServer/POAHelper.java, org/omg/PortableServer/POAManagerPackage/AdapterInactiveHelper.java, org/omg/PortableServer/POAPackage/AdapterAlreadyExistsHelper.java, org/omg/PortableServer/POAPackage/AdapterNonExistentHelper.java, org/omg/PortableServer/POAPackage/InvalidPolicyHelper.java, org/omg/PortableServer/POAPackage/NoServantHelper.java, org/omg/PortableServer/POAPackage/ObjectAlreadyActiveHelper.java, org/omg/PortableServer/POAPackage/ObjectNotActiveHelper.java, org/omg/PortableServer/POAPackage/ServantAlreadyActiveHelper.java, org/omg/PortableServer/POAPackage/ServantNotActiveHelper.java, org/omg/PortableServer/POAPackage/WrongAdapterHelper.java, org/omg/PortableServer/POAPackage/WrongPolicyHelper.java, org/omg/PortableServer/ServantActivatorHelper.java, org/omg/PortableServer/ServantLocatorHelper.java: Remove the typecode caching and always use OrbRestricted.Singleton.
author: Audrius Meskauskas <audriusa@Bioinformatics.org> 2006-07-10 08:24:45 +0000
committer: Audrius Meskauskas <audriusa@Bioinformatics.org> 2006-07-10 08:24:45 +0000
commit: 69bc0cc80cc62a9c38f3e78efa1e73074699ed1b (patch)
tree: e6b9e1bfde89ef6e8cbdb29b74b8d0a4fd5f9a73 /org
parent: c45340c2ccf6c1f9c4ca96bcfdbeabcfd652e2a6 (diff)
download: classpath-69bc0cc80cc62a9c38f3e78efa1e73074699ed1b.tar.gz
100 files changed, 559 insertions, 1046 deletions
diff --git a/org/omg/CORBA/CompletionStatusHelper.java b/org/omg/CORBA/CompletionStatusHelper.java
index 43b6b8c10..bf1c37532 100644
--- a/org/omg/CORBA/CompletionStatusHelper.java
+++ b/org/omg/CORBA/CompletionStatusHelper.java
@@ -52,11 +52,6 @@ import org.omg.CORBA.portable.OutputStream;
 public abstract class CompletionStatusHelper
 {
   /**
-   * The cached typecode value, computed once.
-   */
-  private static TypeCode typeCode;
-
-  /**
    * Extract the {@link CompletionStatus} from the
    * given {@link Any}. This implementation expects
    * the integer (Corba long) value, stating the completion
@@ -125,16 +120,12 @@ public abstract class CompletionStatusHelper
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      {
-        String[] members =
-          new String[] { "COMPLETED_YES", "COMPLETED_NO", "COMPLETED_MAYBE" };
-
-        typeCode =
-          OrbRestricted.Singleton.create_enum_tc(id(), "CompletionStatus",
-                                                  members
-                                                 );
-      }
-    return typeCode;
+    String[] members =
+      new String[] { "COMPLETED_YES", "COMPLETED_NO", "COMPLETED_MAYBE" };
+    
+    return
+      OrbRestricted.Singleton.create_enum_tc(id(), "CompletionStatus",
+                                             members
+      );
   }
 }
 \ No newline at end of file
diff --git a/org/omg/CORBA/CurrentHelper.java b/org/omg/CORBA/CurrentHelper.java
index 51bd65fc1..f292449ec 100644
--- a/org/omg/CORBA/CurrentHelper.java
+++ b/org/omg/CORBA/CurrentHelper.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package org.omg.CORBA;
 
+import gnu.CORBA.OrbRestricted;
+
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
 import org.omg.CORBA.ORB;
@@ -85,18 +87,12 @@ public abstract class CurrentHelper
   }
 
   /**
-   * The cached {@link Current} typecode, computed once.
-   */
-  private static TypeCode typeCode;
-
-  /**
    * Get the type code of the {@link Current}.
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      typeCode = ORB.init().create_interface_tc(id(), "Current");
-    return typeCode;
+    return
+      OrbRestricted.Singleton.create_interface_tc(id(), "Current");
   }
 
   /**
diff --git a/org/omg/CORBA/DefinitionKindHelper.java b/org/omg/CORBA/DefinitionKindHelper.java
index fddbb585a..ef7e26725 100644
--- a/org/omg/CORBA/DefinitionKindHelper.java
+++ b/org/omg/CORBA/DefinitionKindHelper.java
@@ -55,11 +55,6 @@ import org.omg.CORBA.portable.OutputStream;
 public abstract class DefinitionKindHelper
 {
   /**
-   * The cached typecode value, computed only once.
-   */
-  private static TypeCode typeCode;
-
-  /**
    * Insert the definition kind into the given Any.
    */
   public static void insert(Any a, DefinitionKind that)
@@ -83,25 +78,21 @@ public abstract class DefinitionKindHelper
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      {
-        String[] members =
-          new String[]
-          {
-            "dk_none", "dk_all", "dk_Attribute", "dk_Constant", "dk_Exception",
-            "dk_Interface", "dk_Module", "dk_Operation", "dk_Typedef",
-            "dk_Alias", "dk_Struct", "dk_Union", "dk_Enum", "dk_Primitive",
-            "dk_String", "dk_Sequence", "dk_Array", "dk_Repository",
-            "dk_Wstring", "dk_Fixed", "dk_Value", "dk_ValueBox",
-            "dk_ValueMember", "dk_Native"
-          };
-
-        typeCode =
-          OrbRestricted.Singleton.create_enum_tc(id(), "DefinitionKind",
-                                                  members
-                                                 );
-      }
-    return typeCode;
+    String[] members =
+      new String[]
+                 {
+                  "dk_none", "dk_all", "dk_Attribute", "dk_Constant", "dk_Exception",
+                  "dk_Interface", "dk_Module", "dk_Operation", "dk_Typedef",
+                  "dk_Alias", "dk_Struct", "dk_Union", "dk_Enum", "dk_Primitive",
+                  "dk_String", "dk_Sequence", "dk_Array", "dk_Repository",
+                  "dk_Wstring", "dk_Fixed", "dk_Value", "dk_ValueBox",
+                  "dk_ValueMember", "dk_Native"
+                 };
+    
+    return
+    OrbRestricted.Singleton.create_enum_tc(id(), "DefinitionKind",
+                                           members
+    );
   }
 
   /**
diff --git a/org/omg/CORBA/IDLTypeHelper.java b/org/omg/CORBA/IDLTypeHelper.java
index 635168eb8..ff874947f 100644
--- a/org/omg/CORBA/IDLTypeHelper.java
+++ b/org/omg/CORBA/IDLTypeHelper.java
@@ -53,11 +53,6 @@ import org.omg.CORBA.portable.OutputStream;
 public abstract class IDLTypeHelper
 {
   /**
-   * The cached typecode value, computed once.
-   */
-  private static TypeCode typeCode;
-
-  /**
    * Insert the IDL type into the given Any.
    */
   public static void insert(Any a, IDLType that)
@@ -81,14 +76,8 @@ public abstract class IDLTypeHelper
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      {
-        typeCode =
-          OrbRestricted.Singleton.create_interface_tc(IDLTypeHelper.id(),
-                                                       "IDLType"
-                                                      );
-      }
-    return typeCode;
+    return OrbRestricted.Singleton.create_interface_tc(IDLTypeHelper.id(),
+                                                       "IDLType");
   }
 
   /**
diff --git a/org/omg/CORBA/NameValuePairHelper.java b/org/omg/CORBA/NameValuePairHelper.java
index 5d2430b23..f6d933930 100644
--- a/org/omg/CORBA/NameValuePairHelper.java
+++ b/org/omg/CORBA/NameValuePairHelper.java
@@ -43,6 +43,7 @@ import gnu.CORBA.typecodes.AliasTypeCode;
 import gnu.CORBA.typecodes.PrimitiveTypeCode;
 import gnu.CORBA.typecodes.StringTypeCode;
 import gnu.CORBA.Minor;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
@@ -61,11 +62,6 @@ public abstract class NameValuePairHelper
   private static String _id = "IDL:omg.org/CORBA/NameValuePair:1.0";
 
   /**
-   * The cached type code value.
-   */
-  private static TypeCode typeCode;
-
-  /**
    * Extract the NameValuePair from the given {@link Any}.
    */
   public static NameValuePair extract(Any a)
@@ -115,21 +111,18 @@ public abstract class NameValuePairHelper
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      {
-        StructMember[] members = new StructMember[ 2 ];
+    StructMember[] members = new StructMember[2];
 
-        TypeCode t_id =
-          new AliasTypeCode(new StringTypeCode(TCKind.tk_string), "", "id");
+    TypeCode t_id = new AliasTypeCode(new StringTypeCode(TCKind.tk_string), "",
+                                      "id");
 
-        members [ 0 ] = new StructMember("id", t_id, null);
+    members[0] = new StructMember("id", t_id, null);
 
-        members [ 1 ] =
-          new StructMember("value", new PrimitiveTypeCode(TCKind.tk_any), null);
+    members[1] = new StructMember("value",
+                                  new PrimitiveTypeCode(TCKind.tk_any), null);
 
-        typeCode = ORB.init().create_struct_tc(id(), "NameValuePair", members);
-      }
-    return typeCode;
+    return OrbRestricted.Singleton.create_struct_tc(id(), "NameValuePair",
+                                                    members);
   }
 
   /**
diff --git a/org/omg/CORBA/ObjectHelper.java b/org/omg/CORBA/ObjectHelper.java
index 220f2dace..f662a7888 100644
--- a/org/omg/CORBA/ObjectHelper.java
+++ b/org/omg/CORBA/ObjectHelper.java
@@ -39,6 +39,7 @@ exception statement from your version. */
 package org.omg.CORBA;
 
 import gnu.CORBA.Minor;
+import gnu.CORBA.OrbRestricted;
 import gnu.CORBA.typecodes.PrimitiveTypeCode;
 
 import org.omg.CORBA.portable.InputStream;
@@ -51,8 +52,6 @@ import org.omg.CORBA.portable.OutputStream;
  */
 public abstract class ObjectHelper
 {
-  static TypeCode typeCode;
-
   /**
    * Extract the array of object from the given {@link Any}.
    */
@@ -100,9 +99,7 @@ public abstract class ObjectHelper
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      typeCode = ORB.init().get_primitive_tc(TCKind.tk_objref);
-    return typeCode;
+    return OrbRestricted.Singleton.get_primitive_tc(TCKind.tk_objref);
   }
 
   /**
diff --git a/org/omg/CORBA/ParameterModeHelper.java b/org/omg/CORBA/ParameterModeHelper.java
index ac17a9235..c96ce94ac 100644
--- a/org/omg/CORBA/ParameterModeHelper.java
+++ b/org/omg/CORBA/ParameterModeHelper.java
@@ -54,11 +54,6 @@ import org.omg.CORBA.portable.OutputStream;
 public abstract class ParameterModeHelper
 {
   /**
-   * The cached typecode value, computed only once.
-   */
-  private static TypeCode typeCode;
-
-  /**
    * Insert the parameter mode into the given Any.
    */
   public static void insert(Any any, ParameterMode that)
@@ -81,15 +76,11 @@ public abstract class ParameterModeHelper
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      {
         String[] members =
           new String[] { "PARAM_IN", "PARAM_OUT", "PARAM_INOUT" };
 
-        typeCode =
+        return
           OrbRestricted.Singleton.create_enum_tc(id(), "ParameterMode", members);
-      }
-    return typeCode;
   }
 
   /**
diff --git a/org/omg/CORBA/PolicyErrorCodeHelper.java b/org/omg/CORBA/PolicyErrorCodeHelper.java
index ab7ac9547..6feabdcfd 100644
--- a/org/omg/CORBA/PolicyErrorCodeHelper.java
+++ b/org/omg/CORBA/PolicyErrorCodeHelper.java
@@ -106,7 +106,7 @@ public abstract class PolicyErrorCodeHelper
   }
 
   /**
-   * Delegates call to {@link OutputStream.write_short()}.
+   * Delegates call to {@link OutputStream#write_short()}.
    */
   public static void write(OutputStream ostream, short value)
   {
diff --git a/org/omg/CORBA/PolicyErrorHelper.java b/org/omg/CORBA/PolicyErrorHelper.java
index 49db768cd..27b5b465e 100644
--- a/org/omg/CORBA/PolicyErrorHelper.java
+++ b/org/omg/CORBA/PolicyErrorHelper.java
@@ -39,6 +39,7 @@ exception statement from your version. */
 package org.omg.CORBA;
 
 import gnu.CORBA.Minor;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
@@ -57,32 +58,23 @@ import org.omg.CORBA.portable.OutputStream;
 public abstract class PolicyErrorHelper
 {
   /**
-   * The cached typecode value, computed only once.
-   */
-  private static TypeCode typeCode;
-
-  /**
    * Create the PolicyError typecode. The typecode defines a structure, named
    * "PolicyError", containing the {@link PolicyErrorCode} (alias int) field,
    * named "reason".
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      {
-        ORB orb = ORB.init();
-        StructMember[] members = new StructMember[ 1 ];
-
-        TypeCode field;
-
-        field =
-          orb.create_alias_tc("IDL:omg.org/CORBA/PolicyErrorCode:1.0",
-            "PolicyErrorCode", orb.get_primitive_tc(TCKind.tk_short)
-          );
-        members [ 0 ] = new StructMember("reason", field, null);
-        typeCode = orb.create_exception_tc(id(), "PolicyError", members);
-      }
-    return typeCode;
+    ORB orb = OrbRestricted.Singleton;
+    StructMember[] members = new StructMember[ 1 ];
+    
+    TypeCode field;
+    
+    field =
+      orb.create_alias_tc("IDL:omg.org/CORBA/PolicyErrorCode:1.0",
+                          "PolicyErrorCode", orb.get_primitive_tc(TCKind.tk_short)
+      );
+    members [ 0 ] = new StructMember("reason", field, null);
+    return orb.create_exception_tc(id(), "PolicyError", members);
   }
 
   /**
diff --git a/org/omg/CORBA/PolicyHelper.java b/org/omg/CORBA/PolicyHelper.java
index 66fb0aa08..53b56244e 100644
--- a/org/omg/CORBA/PolicyHelper.java
+++ b/org/omg/CORBA/PolicyHelper.java
@@ -39,6 +39,7 @@ exception statement from your version. */
 package org.omg.CORBA;
 
 import gnu.CORBA.Minor;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
@@ -60,20 +61,13 @@ import org.omg.CORBA.portable.OutputStream;
 public abstract class PolicyHelper
 {
   /**
-   * The cached {@link Policy} typecode, computed once.
-   */
-  private static TypeCode typeCode;
-
-  /**
    * Get the type code of the {@link Policy}.
    *
    * @return interface typecode, named "Policy".
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      typeCode = ORB.init().create_interface_tc(id(), "Policy");
-    return typeCode;
+    return OrbRestricted.Singleton.create_interface_tc(id(), "Policy");
   }
 
   /**
diff --git a/org/omg/CORBA/PolicyListHelper.java b/org/omg/CORBA/PolicyListHelper.java
index 6e4d329b8..da0135c02 100644
--- a/org/omg/CORBA/PolicyListHelper.java
+++ b/org/omg/CORBA/PolicyListHelper.java
@@ -39,6 +39,7 @@ exception statement from your version. */
 package org.omg.CORBA;
 
 import gnu.CORBA.Minor;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
@@ -60,18 +61,11 @@ import org.omg.CORBA.portable.OutputStream;
 public abstract class PolicyListHelper
 {
   /**
-   * The cached {@link Policy[]} typecode, computed once.
-   */
-  private static TypeCode typeCode;
-
-  /**
    * Get the type code of the {@link Policy[]}.
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      typeCode = ORB.init().create_interface_tc(id(), "Policy[]");
-    return typeCode;
+     return OrbRestricted.Singleton.create_interface_tc(id(), "Policy[]");
   }
 
   /**
diff --git a/org/omg/CORBA/PolicyTypeHelper.java b/org/omg/CORBA/PolicyTypeHelper.java
index dadd3a9e6..7d5f9bf76 100644
--- a/org/omg/CORBA/PolicyTypeHelper.java
+++ b/org/omg/CORBA/PolicyTypeHelper.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package org.omg.CORBA;
 
+import gnu.CORBA.OrbRestricted;
+
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
 import org.omg.CORBA.ORB;
@@ -65,7 +67,7 @@ public abstract class PolicyTypeHelper
    */
   public static TypeCode type()
   {
-    ORB orb = ORB.init();
+    ORB orb = OrbRestricted.Singleton;
     return orb.create_alias_tc(id(), "PolicyType",
                                orb.get_primitive_tc(TCKind.tk_ulong)
                               );
diff --git a/org/omg/CORBA/ServiceDetailHelper.java b/org/omg/CORBA/ServiceDetailHelper.java
index 58000f2c5..76fbda610 100644
--- a/org/omg/CORBA/ServiceDetailHelper.java
+++ b/org/omg/CORBA/ServiceDetailHelper.java
@@ -39,6 +39,7 @@ exception statement from your version. */
 package org.omg.CORBA;
 
 import gnu.CORBA.Minor;
+import gnu.CORBA.OrbRestricted;
 import gnu.CORBA.ServiceDetailHolder;
 
 import org.omg.CORBA.portable.InputStream;
@@ -57,11 +58,6 @@ public abstract class ServiceDetailHelper
   private static String _id = "IDL:omg.org/CORBA/ServiceDetail:1.0";
 
   /**
-   * The cached typecode value, computed once.
-   */
-  private static TypeCode typeCode;
-
-  /**
    * Extract the service detail info from the given {@link Any}
    *
    * @param a the Any to extract from.
@@ -137,25 +133,21 @@ public abstract class ServiceDetailHelper
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      {
-        ORB orb = ORB.init();
-
-        StructMember[] members = new StructMember[ 2 ];
-
-        TypeCode type =
-          orb.create_alias_tc(_id, "ServiceDetailType",
-            orb.get_primitive_tc(TCKind.tk_ulong)
-          );
-        members [ 0 ] = new StructMember("service_detail_type", type, null);
-
-        TypeCode data =
-          orb.create_sequence_tc(0, orb.get_primitive_tc(TCKind.tk_octet));
-        members [ 1 ] = new StructMember("service_detail", data, null);
-
-        typeCode = orb.create_struct_tc(id(), "ServiceDetail", members);
-      }
-    return typeCode;
+    ORB orb = OrbRestricted.Singleton;
+    
+    StructMember[] members = new StructMember[ 2 ];
+    
+    TypeCode type =
+      orb.create_alias_tc(_id, "ServiceDetailType",
+                          orb.get_primitive_tc(TCKind.tk_ulong)
+      );
+    members [ 0 ] = new StructMember("service_detail_type", type, null);
+    
+    TypeCode data =
+      orb.create_sequence_tc(0, orb.get_primitive_tc(TCKind.tk_octet));
+    members [ 1 ] = new StructMember("service_detail", data, null);
+    
+    return orb.create_struct_tc(id(), "ServiceDetail", members);
   }
 
   /**
diff --git a/org/omg/CORBA/ServiceInformationHelper.java b/org/omg/CORBA/ServiceInformationHelper.java
index 78a21d182..f77378fd7 100644
--- a/org/omg/CORBA/ServiceInformationHelper.java
+++ b/org/omg/CORBA/ServiceInformationHelper.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package org.omg.CORBA;
 
+import gnu.CORBA.OrbRestricted;
+
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
 
@@ -57,11 +59,6 @@ public abstract class ServiceInformationHelper
   private static String _id = "IDL:org/omg/CORBA/ServiceInformation:1.0";
 
   /**
-   * The caches typecode value, computed once.
-   */
-  private static TypeCode typeCode;
-
-  /**
    * Extract the service information from the given Any.
    */
   public static ServiceInformation extract(Any a)
@@ -109,34 +106,30 @@ public abstract class ServiceInformationHelper
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      {
-        ORB orb = ORB.init();
-
-        StructMember[] members = new StructMember[ 2 ];
-        TypeCode member;
-
-        member =
-          orb.create_alias_tc("IDL:omg.org/CORBA/ServiceOptionSeq:1.0",
-                              "ServiceOptionSeq", LongSeqHelper.type()
-                             );
-
-        members [ 0 ] = new StructMember("service_options", member, null);
-
-        member = ServiceDetailHelper.type();
-        member = orb.create_sequence_tc(0, member);
-        member =
-          orb.create_alias_tc("IDL:omg.org/CORBA/ServiceDetailSeq:1.0",
-                              "ServiceDetailSeq", member
-                             );
-        members [ 1 ] = new StructMember("service_details", member, null);
-
-        typeCode =
-          orb.create_struct_tc(ServiceInformationHelper.id(),
-                               "ServiceInformation", members
-                              );
-      }
-    return typeCode;
+    ORB orb = OrbRestricted.Singleton;
+    
+    StructMember[] members = new StructMember[ 2 ];
+    TypeCode member;
+    
+    member =
+      orb.create_alias_tc("IDL:omg.org/CORBA/ServiceOptionSeq:1.0",
+                          "ServiceOptionSeq", LongSeqHelper.type()
+      );
+    
+    members [ 0 ] = new StructMember("service_options", member, null);
+    
+    member = ServiceDetailHelper.type();
+    member = orb.create_sequence_tc(0, member);
+    member =
+      orb.create_alias_tc("IDL:omg.org/CORBA/ServiceDetailSeq:1.0",
+                          "ServiceDetailSeq", member
+      );
+    members [ 1 ] = new StructMember("service_details", member, null);
+    
+    return
+    orb.create_struct_tc(ServiceInformationHelper.id(),
+                         "ServiceInformation", members
+    );
   }
 
   /**
diff --git a/org/omg/CORBA/SetOverrideTypeHelper.java b/org/omg/CORBA/SetOverrideTypeHelper.java
index 1fa1ef868..fb2c8235a 100644
--- a/org/omg/CORBA/SetOverrideTypeHelper.java
+++ b/org/omg/CORBA/SetOverrideTypeHelper.java
@@ -52,11 +52,6 @@ import org.omg.CORBA.portable.OutputStream;
 public abstract class SetOverrideTypeHelper
 {
   /**
-   * The cached typecode value, computed only once.
-   */
-  private static TypeCode typeCode;
-
-  /**
    * Insert the definition kind into the given Any.
    */
   public static void insert(Any any, SetOverrideType that)
@@ -79,20 +74,16 @@ public abstract class SetOverrideTypeHelper
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      {
-        String[] members =
-          new String[]
-          {
-            "SET_OVERRIDE" ,"ADD_OVERRIDE" 
-          };
-
-        typeCode =
-          OrbRestricted.Singleton.create_enum_tc(id(), "SetOverrideType",
-                                                  members
-                                                 );
-      }
-    return typeCode;
+    String[] members =
+      new String[]
+                 {
+                  "SET_OVERRIDE" ,"ADD_OVERRIDE" 
+                 };
+    
+    return
+    OrbRestricted.Singleton.create_enum_tc(id(), "SetOverrideType",
+                                           members
+    );
   }
 
   /**
diff --git a/org/omg/CORBA/StringValueHelper.java b/org/omg/CORBA/StringValueHelper.java
index 24e79ce57..5273f5cfb 100644
--- a/org/omg/CORBA/StringValueHelper.java
+++ b/org/omg/CORBA/StringValueHelper.java
@@ -66,11 +66,6 @@ public class StringValueHelper
   private static final String id = "IDL:omg.org/CORBA/StringValue:1.0";
 
   /**
-   * The cached typecode value, computed once.
-   */
-  private static TypeCode typecode;
-
-  /**
    * The String typecode.
    */
   private static final TypeCode tString =
@@ -175,18 +170,13 @@ public class StringValueHelper
   }
 
   /**
-   * Create and return the value box typecode, named "StringValue",
-   * with the content typecode being unbounded string.
+   * Create and return the value box typecode, named "StringValue", with the
+   * content typecode being unbounded string.
    */
   public static TypeCode type()
   {
-    if (typecode == null)
-      {
-        ORB orb = OrbRestricted.Singleton;
-        typecode =
-          orb.create_value_box_tc(id(), "StringValue", tString);
-      }
-    return typecode;
+    ORB orb = OrbRestricted.Singleton;
+    return orb.create_value_box_tc(id(), "StringValue", tString);
   }
 
   /**
diff --git a/org/omg/CORBA/UnionMemberHelper.java b/org/omg/CORBA/UnionMemberHelper.java
index c599542fb..ef69329b7 100644
--- a/org/omg/CORBA/UnionMemberHelper.java
+++ b/org/omg/CORBA/UnionMemberHelper.java
@@ -94,7 +94,7 @@ public abstract class UnionMemberHelper
               {
                 if (active)
                   {
-                    return ORB.init().create_recursive_tc(id());
+                    return OrbRestricted.Singleton.create_recursive_tc(id());
                   }
                 active = true;
 
diff --git a/org/omg/CORBA/UnknownUserExceptionHelper.java b/org/omg/CORBA/UnknownUserExceptionHelper.java
index e93dc7403..0ca50cb88 100644
--- a/org/omg/CORBA/UnknownUserExceptionHelper.java
+++ b/org/omg/CORBA/UnknownUserExceptionHelper.java
@@ -39,6 +39,7 @@ exception statement from your version. */
 package org.omg.CORBA;
 
 import gnu.CORBA.Minor;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
@@ -57,30 +58,21 @@ import org.omg.CORBA.portable.OutputStream;
 public abstract class UnknownUserExceptionHelper
 {
   /**
-   * The cached typecode value, computed only once.
-   */
-  private static TypeCode typeCode;
-
-  /**
    * Create the UnknownUserException typecode (structure,
    * named "UnknownUserException", containing a single field of
    * type {@link Any}, named "except".
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      {
-        ORB orb = ORB.init();
+        ORB orb = OrbRestricted.Singleton;
         StructMember[] members = new StructMember[ 1 ];
 
         TypeCode field;
 
         field = orb.get_primitive_tc(TCKind.tk_any);
         members [ 0 ] = new StructMember("except", field, null);
-        typeCode =
+        return
           orb.create_exception_tc(id(), "UnknownUserException", members);
-      }
-    return typeCode;
   }
 
   /**
diff --git a/org/omg/CORBA/VisibilityHelper.java b/org/omg/CORBA/VisibilityHelper.java
index a09e5b686..a00f96e14 100644
--- a/org/omg/CORBA/VisibilityHelper.java
+++ b/org/omg/CORBA/VisibilityHelper.java
@@ -53,11 +53,6 @@ import org.omg.CORBA.portable.OutputStream;
 public abstract class VisibilityHelper
 {
   /**
-   * The cached typecode value, computed only once.
-   */
-  private static TypeCode typeCode;
-
-  /**
    * Insert the Visibility into the given Any.
    * Uses {@link Any#insert_short}.
    */
@@ -80,14 +75,10 @@ public abstract class VisibilityHelper
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      {
         TypeCode tshort =
           OrbRestricted.Singleton.get_primitive_tc(TCKind.tk_short);
-        typeCode =
+        return
           OrbRestricted.Singleton.create_alias_tc(id(), "Visibility", tshort);
-      }
-    return typeCode;
   }
 
   /**
diff --git a/org/omg/CORBA/WStringValueHelper.java b/org/omg/CORBA/WStringValueHelper.java
index 1c63a408e..17f23214c 100644
--- a/org/omg/CORBA/WStringValueHelper.java
+++ b/org/omg/CORBA/WStringValueHelper.java
@@ -66,11 +66,6 @@ public class WStringValueHelper
   private static final String id = "IDL:omg.org/CORBA/WStringValue:1.0";
 
   /**
-   * The cached typecode value, computed once.
-   */
-  private static TypeCode typecode;
-
-  /**
    * The Wide String typecode.
    */
   private static final TypeCode twString =
@@ -175,18 +170,13 @@ public class WStringValueHelper
   }
 
   /**
-   * Create and return the value box typecode, named "WStringValue",
-   * with the content typecode being unbounded string.
+   * Create and return the value box typecode, named "WStringValue", with the
+   * content typecode being unbounded string.
    */
   public static TypeCode type()
   {
-    if (typecode == null)
-      {
-        ORB orb = OrbRestricted.Singleton;
-        typecode =
-          orb.create_value_box_tc(id(), "WStringValue", twString);
-      }
-    return typecode;
+    ORB orb = OrbRestricted.Singleton;
+    return orb.create_value_box_tc(id(), "WStringValue", twString);
   }
 
   /**
diff --git a/org/omg/CORBA/WrongTransactionHelper.java b/org/omg/CORBA/WrongTransactionHelper.java
index 5bb5baff2..27368a4c0 100644
--- a/org/omg/CORBA/WrongTransactionHelper.java
+++ b/org/omg/CORBA/WrongTransactionHelper.java
@@ -40,6 +40,7 @@ package org.omg.CORBA;
 
 import gnu.CORBA.EmptyExceptionHolder;
 import gnu.CORBA.Minor;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
@@ -58,23 +59,14 @@ import org.omg.CORBA.portable.OutputStream;
 public abstract class WrongTransactionHelper
 {
   /**
-   * The cached typecode value, computed only once.
-   */
-  private static TypeCode typeCode;
-
-  /**
    * Create the WrongTransaction typecode (structure,
    * named "WrongTransaction"), no fields.
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      {
-        ORB orb = ORB.init();
-        StructMember[] members = new StructMember[ 0 ];
-        typeCode = orb.create_exception_tc(id(), "WrongTransaction", members);
-      }
-    return typeCode;
+    ORB orb = OrbRestricted.Singleton;
+    StructMember[] members = new StructMember[ 0 ];
+    return orb.create_exception_tc(id(), "WrongTransaction", members);
   }
 
   /* Every user exception with no user defined
diff --git a/org/omg/CosNaming/BindingHelper.java b/org/omg/CosNaming/BindingHelper.java
index b5b420772..86b077016 100644
--- a/org/omg/CosNaming/BindingHelper.java
+++ b/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/org/omg/CosNaming/BindingIteratorHelper.java b/org/omg/CosNaming/BindingIteratorHelper.java
index 64f7b4dfa..cb17d5748 100644
--- a/org/omg/CosNaming/BindingIteratorHelper.java
+++ b/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/org/omg/CosNaming/BindingListHelper.java b/org/omg/CosNaming/BindingListHelper.java
index 44fe39dca..de04989e0 100644
--- a/org/omg/CosNaming/BindingListHelper.java
+++ b/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/org/omg/CosNaming/BindingTypeHelper.java b/org/omg/CosNaming/BindingTypeHelper.java
index 2f0dc71c4..8f456ee70 100644
--- a/org/omg/CosNaming/BindingTypeHelper.java
+++ b/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/org/omg/CosNaming/NameComponentHelper.java b/org/omg/CosNaming/NameComponentHelper.java
index 8499edfe6..8127aa01d 100644
--- a/org/omg/CosNaming/NameComponentHelper.java
+++ b/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/org/omg/CosNaming/NameHelper.java b/org/omg/CosNaming/NameHelper.java
index 18faf3182..f66fa4f09 100644
--- a/org/omg/CosNaming/NameHelper.java
+++ b/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/org/omg/CosNaming/NamingContextExtHelper.java b/org/omg/CosNaming/NamingContextExtHelper.java
index 86bf8c55d..aca0e9dfd 100644
--- a/org/omg/CosNaming/NamingContextExtHelper.java
+++ b/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/org/omg/CosNaming/NamingContextExtPackage/AddressHelper.java b/org/omg/CosNaming/NamingContextExtPackage/AddressHelper.java
index cf4029ccf..810460744 100644
--- a/org/omg/CosNaming/NamingContextExtPackage/AddressHelper.java
+++ b/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/org/omg/CosNaming/NamingContextExtPackage/InvalidAddressHelper.java b/org/omg/CosNaming/NamingContextExtPackage/InvalidAddressHelper.java
index 02f8fccb6..c7f3849a0 100644
--- a/org/omg/CosNaming/NamingContextExtPackage/InvalidAddressHelper.java
+++ b/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/org/omg/CosNaming/NamingContextExtPackage/StringNameHelper.java b/org/omg/CosNaming/NamingContextExtPackage/StringNameHelper.java
index 24c69fcb9..06faa2ff9 100644
--- a/org/omg/CosNaming/NamingContextExtPackage/StringNameHelper.java
+++ b/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/org/omg/CosNaming/NamingContextExtPackage/URLStringHelper.java b/org/omg/CosNaming/NamingContextExtPackage/URLStringHelper.java
index 503fe22d6..173bb989e 100644
--- a/org/omg/CosNaming/NamingContextExtPackage/URLStringHelper.java
+++ b/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/org/omg/CosNaming/NamingContextHelper.java b/org/omg/CosNaming/NamingContextHelper.java
index fb9b091a6..48b90c25a 100644
--- a/org/omg/CosNaming/NamingContextHelper.java
+++ b/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/org/omg/CosNaming/NamingContextPackage/AlreadyBoundHelper.java b/org/omg/CosNaming/NamingContextPackage/AlreadyBoundHelper.java
index 6bf7bd7a6..f43111cb2 100644
--- a/org/omg/CosNaming/NamingContextPackage/AlreadyBoundHelper.java
+++ b/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/org/omg/CosNaming/NamingContextPackage/CannotProceedHelper.java b/org/omg/CosNaming/NamingContextPackage/CannotProceedHelper.java
index 1d0b6049b..85e391cf8 100644
--- a/org/omg/CosNaming/NamingContextPackage/CannotProceedHelper.java
+++ b/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/org/omg/CosNaming/NamingContextPackage/InvalidNameHelper.java b/org/omg/CosNaming/NamingContextPackage/InvalidNameHelper.java
index 8f1133602..5893332b8 100644
--- a/org/omg/CosNaming/NamingContextPackage/InvalidNameHelper.java
+++ b/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/org/omg/CosNaming/NamingContextPackage/NotEmptyHelper.java b/org/omg/CosNaming/NamingContextPackage/NotEmptyHelper.java
index 6333dfcbc..a9b802f95 100644
--- a/org/omg/CosNaming/NamingContextPackage/NotEmptyHelper.java
+++ b/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/org/omg/CosNaming/NamingContextPackage/NotFoundHelper.java b/org/omg/CosNaming/NamingContextPackage/NotFoundHelper.java
index 442b7db9e..0be9b75bc 100644
--- a/org/omg/CosNaming/NamingContextPackage/NotFoundHelper.java
+++ b/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/org/omg/CosNaming/NamingContextPackage/NotFoundReasonHelper.java b/org/omg/CosNaming/NamingContextPackage/NotFoundReasonHelper.java
index 45a42a0ba..9d44dcbf3 100644
--- a/org/omg/CosNaming/NamingContextPackage/NotFoundReasonHelper.java
+++ b/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"
+                                         }
+    );
   }
 
   /**
diff --git a/org/omg/DynamicAny/AnySeqHelper.java b/org/omg/DynamicAny/AnySeqHelper.java
index 60e4e6ea7..ddf1422ff 100644
--- a/org/omg/DynamicAny/AnySeqHelper.java
+++ b/org/omg/DynamicAny/AnySeqHelper.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package org.omg.DynamicAny;
 
+import gnu.CORBA.OrbRestricted;
+
 import org.omg.CORBA.Any;
 import org.omg.CORBA.ORB;
 import org.omg.CORBA.TCKind;
@@ -54,11 +56,6 @@ import org.omg.CORBA.portable.OutputStream;
 public abstract class AnySeqHelper
 {
   /**
-   * The cached typecode value, computed only once.
-   */
-  private static TypeCode typeCode;
-
-  /**
    * Delegates call to {@link org.omg.CORBA.AnySeqHelper#extract}.
    */
   public static Any[] extract(Any any)
@@ -102,14 +99,10 @@ public abstract class AnySeqHelper
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      {
-        ORB orb = ORB.init();
-        TypeCode t =
-          orb.create_sequence_tc(0, orb.get_primitive_tc(TCKind.tk_any));
-        typeCode = orb.create_alias_tc(id(), "AnySeq", t);
-      }
-    return typeCode;
+    ORB orb = OrbRestricted.Singleton;
+    TypeCode t =
+      orb.create_sequence_tc(0, orb.get_primitive_tc(TCKind.tk_any));
+    return orb.create_alias_tc(id(), "AnySeq", t);
   }
 
   /**
diff --git a/org/omg/DynamicAny/DynAnyFactoryHelper.java b/org/omg/DynamicAny/DynAnyFactoryHelper.java
index b8e3aafef..97b54873f 100644
--- a/org/omg/DynamicAny/DynAnyFactoryHelper.java
+++ b/org/omg/DynamicAny/DynAnyFactoryHelper.java
@@ -40,6 +40,7 @@ exception statement from your version. */
 package org.omg.DynamicAny;
 
 import gnu.CORBA.Minor;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.BAD_PARAM;
 import org.omg.CORBA.TypeCode;
@@ -107,7 +108,7 @@ public abstract class DynAnyFactoryHelper
    */
   public static TypeCode type()
   {
-    return ORB.init().create_interface_tc(id(), "DynAnyFactory");
+    return OrbRestricted.Singleton.create_interface_tc(id(), "DynAnyFactory");
   }
 
   /**
diff --git a/org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCodeHelper.java b/org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCodeHelper.java
index a9f45c4b7..96dbb5fb6 100644
--- a/org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCodeHelper.java
+++ b/org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCodeHelper.java
@@ -40,6 +40,7 @@ package org.omg.DynamicAny.DynAnyFactoryPackage;
 
 import gnu.CORBA.EmptyExceptionHolder;
 import gnu.CORBA.Minor;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
@@ -58,29 +59,19 @@ import org.omg.CORBA.portable.OutputStream;
 public abstract class InconsistentTypeCodeHelper
 {
   /**
-   * The cached typecode value, computed only once.
-   */
-  private static TypeCode typeCode;
-
-  /**
-   * Create the InconsistentTypeCode typecode (structure,
-   * named "InconsistentTypeCode").
+   * Create the InconsistentTypeCode typecode (structure, named
+   * "InconsistentTypeCode").
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      {
-        ORB orb = ORB.init();
-        StructMember[] members = new StructMember[ 0 ];
-        typeCode =
-          orb.create_exception_tc(id(), "InconsistentTypeCode", members);
-      }
-    return typeCode;
+    ORB orb = OrbRestricted.Singleton;
+    StructMember[] members = new StructMember[0];
+    return orb.create_exception_tc(id(), "InconsistentTypeCode", members);
   }
 
   /**
    * Insert the InconsistentTypeCode into the given Any.
-   *
+   * 
    * @param any the Any to insert into.
    * @param that the InconsistentTypeCode to insert.
    */
diff --git a/org/omg/DynamicAny/DynAnyHelper.java b/org/omg/DynamicAny/DynAnyHelper.java
index 73e2d9856..a238bf48b 100644
--- a/org/omg/DynamicAny/DynAnyHelper.java
+++ b/org/omg/DynamicAny/DynAnyHelper.java
@@ -39,6 +39,8 @@ exception statement from your version. */
 
 package org.omg.DynamicAny;
 
+import gnu.CORBA.OrbRestricted;
+
 import org.omg.CORBA.BAD_PARAM;
 import org.omg.CORBA.TypeCode;
 import org.omg.CORBA.ORB;
@@ -104,7 +106,7 @@ public abstract class DynAnyHelper
    */
   public static TypeCode type()
   {
-    return ORB.init().create_interface_tc(id(), "DynAny");
+    return OrbRestricted.Singleton.create_interface_tc(id(), "DynAny");
   }
 
   /**
diff --git a/org/omg/DynamicAny/DynAnyPackage/InvalidValueHelper.java b/org/omg/DynamicAny/DynAnyPackage/InvalidValueHelper.java
index 1b5004f07..0258d3589 100644
--- a/org/omg/DynamicAny/DynAnyPackage/InvalidValueHelper.java
+++ b/org/omg/DynamicAny/DynAnyPackage/InvalidValueHelper.java
@@ -40,6 +40,7 @@ package org.omg.DynamicAny.DynAnyPackage;
 
 import gnu.CORBA.EmptyExceptionHolder;
 import gnu.CORBA.Minor;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
@@ -58,23 +59,13 @@ import org.omg.CORBA.portable.OutputStream;
 public abstract class InvalidValueHelper
 {
   /**
-   * The cached typecode value, computed only once.
-   */
-  private static TypeCode typeCode;
-
-  /**
-   * Create the InvalidValue typecode (structure,
-   * named "InvalidValue").
+   * Create the InvalidValue typecode (structure, named "InvalidValue").
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      {
-        ORB orb = ORB.init();
-        StructMember[] members = new StructMember[ 0 ];
-        typeCode = orb.create_exception_tc(id(), "InvalidValue", members);
-      }
-    return typeCode;
+    ORB orb = OrbRestricted.Singleton;
+    StructMember[] members = new StructMember[0];
+    return orb.create_exception_tc(id(), "InvalidValue", members);
   }
 
   /* Every user exception with no user defined
diff --git a/org/omg/DynamicAny/DynAnyPackage/TypeMismatchHelper.java b/org/omg/DynamicAny/DynAnyPackage/TypeMismatchHelper.java
index b09ab4db8..244a98aa0 100644
--- a/org/omg/DynamicAny/DynAnyPackage/TypeMismatchHelper.java
+++ b/org/omg/DynamicAny/DynAnyPackage/TypeMismatchHelper.java
@@ -40,6 +40,7 @@ package org.omg.DynamicAny.DynAnyPackage;
 
 import gnu.CORBA.EmptyExceptionHolder;
 import gnu.CORBA.Minor;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
@@ -58,23 +59,13 @@ import org.omg.CORBA.portable.OutputStream;
 public abstract class TypeMismatchHelper
 {
   /**
-   * The cached typecode value, computed only once.
-   */
-  private static TypeCode typeCode;
-
-  /**
-   * Create the TypeMismatch typecode (structure,
-   * named "TypeMismatch").
+   * Create the TypeMismatch typecode (structure, named "TypeMismatch").
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      {
-        ORB orb = ORB.init();
-        StructMember[] members = new StructMember[ 0 ];
-        typeCode = orb.create_exception_tc(id(), "TypeMismatch", members);
-      }
-    return typeCode;
+    ORB orb = OrbRestricted.Singleton;
+    StructMember[] members = new StructMember[0];
+    return orb.create_exception_tc(id(), "TypeMismatch", members);
   }
 
   /* Every user exception with no user defined
diff --git a/org/omg/DynamicAny/DynAnySeqHelper.java b/org/omg/DynamicAny/DynAnySeqHelper.java
index ec3f0c481..66208ea19 100644
--- a/org/omg/DynamicAny/DynAnySeqHelper.java
+++ b/org/omg/DynamicAny/DynAnySeqHelper.java
@@ -40,6 +40,7 @@ package org.omg.DynamicAny;
 
 import gnu.CORBA.DynAnySeqHolder;
 import gnu.CORBA.Minor;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
@@ -63,20 +64,11 @@ import org.omg.CORBA.portable.OutputStream;
  */
 public abstract class DynAnySeqHelper
 {
-  /**
-   * The cached typecode value, computed only once.
-   */
-  private static TypeCode typeCode;
-
   public static TypeCode type()
   {
-    if (typeCode == null)
-      {
-        ORB orb = ORB.init();
-        TypeCode t = orb.create_sequence_tc(0, DynAnyHelper.type());
-        typeCode = orb.create_alias_tc(id(), "DynAnySeq", t);
-      }
-    return typeCode;
+    ORB orb = OrbRestricted.Singleton;
+    TypeCode t = orb.create_sequence_tc(0, DynAnyHelper.type());
+    return orb.create_alias_tc(id(), "DynAnySeq", t);
   }
 
   /**
diff --git a/org/omg/DynamicAny/DynArrayHelper.java b/org/omg/DynamicAny/DynArrayHelper.java
index f2892c856..26824d747 100644
--- a/org/omg/DynamicAny/DynArrayHelper.java
+++ b/org/omg/DynamicAny/DynArrayHelper.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package org.omg.DynamicAny;
 
+import gnu.CORBA.OrbRestricted;
+
 import org.omg.CORBA.BAD_PARAM;
 import org.omg.CORBA.TypeCode;
 import org.omg.CORBA.ORB;
@@ -103,7 +105,7 @@ public abstract class DynArrayHelper
    */
   public static TypeCode type()
   {
-    return ORB.init().create_interface_tc(id(), "DynArray");
+    return OrbRestricted.Singleton.create_interface_tc(id(), "DynArray");
   }
 
   /**
diff --git a/org/omg/DynamicAny/DynEnumHelper.java b/org/omg/DynamicAny/DynEnumHelper.java
index 8db1a2006..9af2e1194 100644
--- a/org/omg/DynamicAny/DynEnumHelper.java
+++ b/org/omg/DynamicAny/DynEnumHelper.java
@@ -39,6 +39,8 @@ exception statement from your version. */
 
 package org.omg.DynamicAny;
 
+import gnu.CORBA.OrbRestricted;
+
 import org.omg.CORBA.BAD_PARAM;
 import org.omg.CORBA.TypeCode;
 import org.omg.CORBA.ORB;
@@ -104,7 +106,7 @@ public abstract class DynEnumHelper
    */
   public static TypeCode type()
   {
-    return ORB.init().create_interface_tc(id(), "DynEnum");
+    return OrbRestricted.Singleton.create_interface_tc(id(), "DynEnum");
   }
 
   /**
diff --git a/org/omg/DynamicAny/DynFixedHelper.java b/org/omg/DynamicAny/DynFixedHelper.java
index 84bb59d9f..4471bb26b 100644
--- a/org/omg/DynamicAny/DynFixedHelper.java
+++ b/org/omg/DynamicAny/DynFixedHelper.java
@@ -39,6 +39,8 @@ exception statement from your version. */
 
 package org.omg.DynamicAny;
 
+import gnu.CORBA.OrbRestricted;
+
 import org.omg.CORBA.BAD_PARAM;
 import org.omg.CORBA.TypeCode;
 import org.omg.CORBA.ORB;
@@ -104,7 +106,7 @@ public abstract class DynFixedHelper
    */
   public static TypeCode type()
   {
-    return ORB.init().create_interface_tc(id(), "DynFixed");
+    return OrbRestricted.Singleton.create_interface_tc(id(), "DynFixed");
   }
 
   /**
diff --git a/org/omg/DynamicAny/DynSequenceHelper.java b/org/omg/DynamicAny/DynSequenceHelper.java
index ad3013371..0aa7cdd2a 100644
--- a/org/omg/DynamicAny/DynSequenceHelper.java
+++ b/org/omg/DynamicAny/DynSequenceHelper.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package org.omg.DynamicAny;
 
+import gnu.CORBA.OrbRestricted;
+
 import org.omg.CORBA.BAD_PARAM;
 import org.omg.CORBA.TypeCode;
 import org.omg.CORBA.ORB;
@@ -103,7 +105,7 @@ public abstract class DynSequenceHelper
    */
   public static TypeCode type()
   {
-    return ORB.init().create_interface_tc(id(), "DynSequence");
+    return OrbRestricted.Singleton.create_interface_tc(id(), "DynSequence");
   }
 
   /**
diff --git a/org/omg/DynamicAny/DynStructHelper.java b/org/omg/DynamicAny/DynStructHelper.java
index 021c5d031..c683260f6 100644
--- a/org/omg/DynamicAny/DynStructHelper.java
+++ b/org/omg/DynamicAny/DynStructHelper.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package org.omg.DynamicAny;
 
+import gnu.CORBA.OrbRestricted;
+
 import org.omg.CORBA.BAD_PARAM;
 import org.omg.CORBA.TypeCode;
 import org.omg.CORBA.ORB;
@@ -103,7 +105,7 @@ public abstract class DynStructHelper
    */
   public static TypeCode type()
   {
-    return ORB.init().create_interface_tc(id(), "DynStruct");
+    return OrbRestricted.Singleton.create_interface_tc(id(), "DynStruct");
   }
 
   /**
diff --git a/org/omg/DynamicAny/DynUnionHelper.java b/org/omg/DynamicAny/DynUnionHelper.java
index 8f924c086..e868ea412 100644
--- a/org/omg/DynamicAny/DynUnionHelper.java
+++ b/org/omg/DynamicAny/DynUnionHelper.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package org.omg.DynamicAny;
 
+import gnu.CORBA.OrbRestricted;
+
 import org.omg.CORBA.BAD_PARAM;
 import org.omg.CORBA.TypeCode;
 import org.omg.CORBA.ORB;
@@ -103,7 +105,7 @@ public abstract class DynUnionHelper
    */
   public static TypeCode type()
   {
-    return ORB.init().create_interface_tc(id(), "DynUnion");
+    return OrbRestricted.Singleton.create_interface_tc(id(), "DynUnion");
   }
 
   /**
diff --git a/org/omg/DynamicAny/DynValueHelper.java b/org/omg/DynamicAny/DynValueHelper.java
index 026ca4990..ad75bc31f 100644
--- a/org/omg/DynamicAny/DynValueHelper.java
+++ b/org/omg/DynamicAny/DynValueHelper.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package org.omg.DynamicAny;
 
+import gnu.CORBA.OrbRestricted;
+
 import org.omg.CORBA.BAD_PARAM;
 import org.omg.CORBA.TypeCode;
 import org.omg.CORBA.ORB;
@@ -103,7 +105,7 @@ public abstract class DynValueHelper
    */
   public static TypeCode type()
   {
-    return ORB.init().create_interface_tc(id(), "DynValue");
+    return OrbRestricted.Singleton.create_interface_tc(id(), "DynValue");
   }
 
   /**
diff --git a/org/omg/DynamicAny/NameDynAnyPairHelper.java b/org/omg/DynamicAny/NameDynAnyPairHelper.java
index a0e5c6b85..a9d9edba7 100644
--- a/org/omg/DynamicAny/NameDynAnyPairHelper.java
+++ b/org/omg/DynamicAny/NameDynAnyPairHelper.java
@@ -40,6 +40,7 @@ package org.omg.DynamicAny;
 
 import gnu.CORBA.Minor;
 import gnu.CORBA.NameDynAnyPairHolder;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
@@ -64,11 +65,6 @@ import org.omg.CORBA.portable.OutputStream;
 public abstract class NameDynAnyPairHelper
 {
   /**
-   * The cached typecode value, computed only once.
-   */
-  private static TypeCode typeCode;
-
-  /**
    * Extract the NameDynAnyPair from given Any.
    * This method uses the NameDynAnyPairHolder.
    *
@@ -107,25 +103,21 @@ public abstract class NameDynAnyPairHelper
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      {
-        ORB orb = ORB.init();
-        StructMember[] members = new StructMember[ 2 ];
-
-        TypeCode field;
-
-        field =
-          orb.create_alias_tc("IDL:omg.org/DynamicAny/FieldName:1.0",
-                              "FieldName",
-                              orb.get_primitive_tc(TCKind.tk_string)
-                             );
-        members [ 0 ] = new StructMember("id", field, null);
-
-        field = DynAnyHelper.type();
-        members [ 1 ] = new StructMember("value", field, null);
-        typeCode = orb.create_struct_tc(id(), "NameDynAnyPair", members);
-      }
-    return typeCode;
+    ORB orb = OrbRestricted.Singleton;
+    StructMember[] members = new StructMember[ 2 ];
+    
+    TypeCode field;
+    
+    field =
+      orb.create_alias_tc("IDL:omg.org/DynamicAny/FieldName:1.0",
+                          "FieldName",
+                          orb.get_primitive_tc(TCKind.tk_string)
+      );
+    members [ 0 ] = new StructMember("id", field, null);
+    
+    field = DynAnyHelper.type();
+    members [ 1 ] = new StructMember("value", field, null);
+    return orb.create_struct_tc(id(), "NameDynAnyPair", members);
   }
 
   /**
diff --git a/org/omg/DynamicAny/NameDynAnyPairSeqHelper.java b/org/omg/DynamicAny/NameDynAnyPairSeqHelper.java
index ec4f72822..56e6104ec 100644
--- a/org/omg/DynamicAny/NameDynAnyPairSeqHelper.java
+++ b/org/omg/DynamicAny/NameDynAnyPairSeqHelper.java
@@ -40,6 +40,7 @@ package org.omg.DynamicAny;
 
 import gnu.CORBA.Minor;
 import gnu.CORBA.NameDynAnyPairSeqHolder;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
@@ -62,20 +63,11 @@ import org.omg.CORBA.portable.OutputStream;
  */
 public abstract class NameDynAnyPairSeqHelper
 {
-  /**
-   * The cached typecode value, computed only once.
-   */
-  private static TypeCode typeCode;
-
   public static TypeCode type()
   {
-    if (typeCode == null)
-      {
-        ORB orb = ORB.init();
-        TypeCode t = orb.create_sequence_tc(0, NameDynAnyPairHelper.type());
-        typeCode = orb.create_alias_tc(id(), "NameDynAnyPairSeq", t);
-      }
-    return typeCode;
+    ORB orb = OrbRestricted.Singleton;
+    TypeCode t = orb.create_sequence_tc(0, NameDynAnyPairHelper.type());
+    return orb.create_alias_tc(id(), "NameDynAnyPairSeq", t);
   }
 
   /**
diff --git a/org/omg/DynamicAny/NameValuePairHelper.java b/org/omg/DynamicAny/NameValuePairHelper.java
index 1e0f52b59..75bbf9a74 100644
--- a/org/omg/DynamicAny/NameValuePairHelper.java
+++ b/org/omg/DynamicAny/NameValuePairHelper.java
@@ -40,6 +40,7 @@ package org.omg.DynamicAny;
 
 import gnu.CORBA.Minor;
 import gnu.CORBA.NameValuePairHolder;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
@@ -58,11 +59,6 @@ import org.omg.CORBA.portable.OutputStream;
 public abstract class NameValuePairHelper
 {
   /**
-   * The cached typecode value, computed only once.
-   */
-  private static TypeCode typeCode;
-
-  /**
    * Create the NameValuePair typecode (structure,
    * named "NameValuePair").
    * The typecode states that the structure contains the
@@ -70,25 +66,21 @@ public abstract class NameValuePairHelper
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      {
-        ORB orb = ORB.init();
-        StructMember[] members = new StructMember[ 2 ];
-
-        TypeCode field;
-
-        field =
-          orb.create_alias_tc("IDL:omg.org/DynamicAny/FieldName:1.0",
-                              "FieldName",
-                              orb.get_primitive_tc(TCKind.tk_string)
-                             );
-        members [ 0 ] = new StructMember("id", field, null);
-
-        field = orb.get_primitive_tc(TCKind.tk_any);
-        members [ 1 ] = new StructMember("value", field, null);
-        typeCode = orb.create_struct_tc(id(), "NameValuePair", members);
-      }
-    return typeCode;
+    ORB orb = OrbRestricted.Singleton;
+    StructMember[] members = new StructMember[ 2 ];
+    
+    TypeCode field;
+    
+    field =
+      orb.create_alias_tc("IDL:omg.org/DynamicAny/FieldName:1.0",
+                          "FieldName",
+                          orb.get_primitive_tc(TCKind.tk_string)
+      );
+    members [ 0 ] = new StructMember("id", field, null);
+    
+    field = orb.get_primitive_tc(TCKind.tk_any);
+    members [ 1 ] = new StructMember("value", field, null);
+    return orb.create_struct_tc(id(), "NameValuePair", members);
   }
 
   /**
diff --git a/org/omg/DynamicAny/NameValuePairSeqHelper.java b/org/omg/DynamicAny/NameValuePairSeqHelper.java
index 62481534e..018ee7d2d 100644
--- a/org/omg/DynamicAny/NameValuePairSeqHelper.java
+++ b/org/omg/DynamicAny/NameValuePairSeqHelper.java
@@ -40,6 +40,7 @@ package org.omg.DynamicAny;
 
 import gnu.CORBA.Minor;
 import gnu.CORBA.NameValuePairSeqHolder;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
@@ -55,20 +56,11 @@ import org.omg.CORBA.portable.OutputStream;
  */
 public abstract class NameValuePairSeqHelper
 {
-  /**
-   * The cached typecode value, computed only once.
-   */
-  private static TypeCode typeCode;
-
   public static TypeCode type()
   {
-    if (typeCode == null)
-      {
-        ORB orb = ORB.init();
-        TypeCode t = orb.create_sequence_tc(0, NameValuePairHelper.type());
-        typeCode = orb.create_alias_tc(id(), "NameValuePairSeq", t);
-      }
-    return typeCode;
+    ORB orb = OrbRestricted.Singleton;
+    TypeCode t = orb.create_sequence_tc(0, NameValuePairHelper.type());
+    return orb.create_alias_tc(id(), "NameValuePairSeq", t);
   }
 
   /**
diff --git a/org/omg/IOP/CodecFactoryHelper.java b/org/omg/IOP/CodecFactoryHelper.java
index fea0b887b..89404f7d5 100644
--- a/org/omg/IOP/CodecFactoryHelper.java
+++ b/org/omg/IOP/CodecFactoryHelper.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package org.omg.IOP;
 
+import gnu.CORBA.OrbRestricted;
+
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_PARAM;
 import org.omg.CORBA.CompletionStatus;
@@ -56,18 +58,11 @@ import org.omg.CORBA.portable.OutputStream;
 public abstract class CodecFactoryHelper
 {
   /**
-   * The cached {@link CodecFactory} typecode, computed once.
-   */
-  private static TypeCode typeCode;
-
-  /**
    * Get the type code of the {@link CodecFactory}.
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      typeCode = ORB.init().create_interface_tc(id(), "CodecFactory");
-    return typeCode;
+    return OrbRestricted.Singleton.create_interface_tc(id(), "CodecFactory");
   }
 
   /**
diff --git a/org/omg/IOP/CodecFactoryPackage/UnknownEncodingHelper.java b/org/omg/IOP/CodecFactoryPackage/UnknownEncodingHelper.java
index e036dbf1f..8861e43da 100644
--- a/org/omg/IOP/CodecFactoryPackage/UnknownEncodingHelper.java
+++ b/org/omg/IOP/CodecFactoryPackage/UnknownEncodingHelper.java
@@ -40,6 +40,7 @@ package org.omg.IOP.CodecFactoryPackage;
 
 import gnu.CORBA.EmptyExceptionHolder;
 import gnu.CORBA.Minor;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.ORB;
 import org.omg.CORBA.Any;
@@ -59,25 +60,16 @@ import org.omg.CORBA.BAD_OPERATION;
 public abstract class UnknownEncodingHelper
 {
   /**
-   * The cached typecode value, computed only once.
-   */
-  private static TypeCode typeCode;
-
-  /**
    * Create the UnknownEncoding typecode (structure, 
    * named "UnknownEncoding").
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      { 
-        ORB orb = ORB.init();
-        StructMember[] members = new StructMember[0];
-        typeCode =
-          orb.create_exception_tc (id(), "UnknownEncoding", members);
+    ORB orb = OrbRestricted.Singleton;
+    StructMember[] members = new StructMember[0];
+    return
+    orb.create_exception_tc (id(), "UnknownEncoding", members);
         
-        }
-    return typeCode;
   } 
 
   /* Every user exception with no user defined fields can use EmptyExceptionHolder */
diff --git a/org/omg/IOP/CodecPackage/FormatMismatchHelper.java b/org/omg/IOP/CodecPackage/FormatMismatchHelper.java
index e353be8f9..2a9295ae8 100644
--- a/org/omg/IOP/CodecPackage/FormatMismatchHelper.java
+++ b/org/omg/IOP/CodecPackage/FormatMismatchHelper.java
@@ -40,6 +40,7 @@ package org.omg.IOP.CodecPackage;
 
 import gnu.CORBA.EmptyExceptionHolder;
 import gnu.CORBA.Minor;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
@@ -58,23 +59,14 @@ import org.omg.CORBA.portable.OutputStream;
 public abstract class FormatMismatchHelper
 {
   /**
-   * The cached typecode value, computed only once.
-   */
-  private static TypeCode typeCode;
-
-  /**
    * Create the FormatMismatch typecode (structure,
    * named "FormatMismatch").
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      {
-        ORB orb = ORB.init();
-        StructMember[] members = new StructMember[ 0 ];
-        typeCode = orb.create_exception_tc(id(), "FormatMismatch", members);
-      }
-    return typeCode;
+    ORB orb = OrbRestricted.Singleton;
+    StructMember[] members = new StructMember[ 0 ];
+    return orb.create_exception_tc(id(), "FormatMismatch", members);
   }
 
   /**
diff --git a/org/omg/IOP/CodecPackage/InvalidTypeForEncodingHelper.java b/org/omg/IOP/CodecPackage/InvalidTypeForEncodingHelper.java
index 8a93c5895..e2a8c9057 100644
--- a/org/omg/IOP/CodecPackage/InvalidTypeForEncodingHelper.java
+++ b/org/omg/IOP/CodecPackage/InvalidTypeForEncodingHelper.java
@@ -40,6 +40,7 @@ package org.omg.IOP.CodecPackage;
 
 import gnu.CORBA.EmptyExceptionHolder;
 import gnu.CORBA.Minor;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
@@ -58,29 +59,19 @@ import org.omg.CORBA.portable.OutputStream;
 public abstract class InvalidTypeForEncodingHelper
 {
   /**
-   * The cached typecode value, computed only once.
-   */
-  private static TypeCode typeCode;
-
-  /**
-   * Create the InvalidTypeForEncoding typecode (structure,
-   * named "InvalidTypeForEncoding").
+   * Create the InvalidTypeForEncoding typecode (structure, named
+   * "InvalidTypeForEncoding").
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      {
-        ORB orb = ORB.init();
-        StructMember[] members = new StructMember[ 0 ];
-        typeCode =
-          orb.create_exception_tc(id(), "InvalidTypeForEncoding", members);
-      }
-    return typeCode;
+    ORB orb = OrbRestricted.Singleton;
+    StructMember[] members = new StructMember[0];
+    return orb.create_exception_tc(id(), "InvalidTypeForEncoding", members);
   }
 
   /**
    * Insert the InvalidTypeForEncoding into the given Any.
-   *
+   * 
    * @param any the Any to insert into.
    * @param that the InvalidTypeForEncoding to insert.
    */
diff --git a/org/omg/IOP/CodecPackage/TypeMismatchHelper.java b/org/omg/IOP/CodecPackage/TypeMismatchHelper.java
index 33951de70..432e84d24 100644
--- a/org/omg/IOP/CodecPackage/TypeMismatchHelper.java
+++ b/org/omg/IOP/CodecPackage/TypeMismatchHelper.java
@@ -40,6 +40,7 @@ package org.omg.IOP.CodecPackage;
 
 import gnu.CORBA.EmptyExceptionHolder;
 import gnu.CORBA.Minor;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
@@ -58,23 +59,14 @@ import org.omg.CORBA.portable.OutputStream;
 public abstract class TypeMismatchHelper
 {
   /**
-   * The cached typecode value, computed only once.
-   */
-  private static TypeCode typeCode;
-
-  /**
    * Create the TypeMismatch typecode (structure,
    * named "TypeMismatch").
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      {
-        ORB orb = ORB.init();
-        StructMember[] members = new StructMember[ 0 ];
-        typeCode = orb.create_exception_tc(id(), "TypeMismatch", members);
-      }
-    return typeCode;
+    ORB orb = OrbRestricted.Singleton;
+    StructMember[] members = new StructMember[ 0 ];
+    return orb.create_exception_tc(id(), "TypeMismatch", members);
   }
 
   /**
diff --git a/org/omg/IOP/ComponentIdHelper.java b/org/omg/IOP/ComponentIdHelper.java
index 64fbdfd74..35ffd9a69 100644
--- a/org/omg/IOP/ComponentIdHelper.java
+++ b/org/omg/IOP/ComponentIdHelper.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package org.omg.IOP;
 
+import gnu.CORBA.OrbRestricted;
+
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
 import org.omg.CORBA.ORB;
@@ -65,10 +67,10 @@ public abstract class ComponentIdHelper
    */
   public static TypeCode type()
   {
-    ORB orb = ORB.init();
-    return orb.create_alias_tc("IDL:omg.org/IOP/ComponentId:1.0", "ComponentId",
-                               orb.get_primitive_tc(TCKind.tk_ulong)
-                              );
+    ORB orb = OrbRestricted.Singleton;
+    return orb.create_alias_tc("IDL:omg.org/IOP/ComponentId:1.0",
+                               "ComponentId",
+                               orb.get_primitive_tc(TCKind.tk_ulong));
   }
 
   /**
diff --git a/org/omg/IOP/IORHelper.java b/org/omg/IOP/IORHelper.java
index 77f18d9b9..197e15a12 100644
--- a/org/omg/IOP/IORHelper.java
+++ b/org/omg/IOP/IORHelper.java
@@ -39,6 +39,7 @@ exception statement from your version. */
 package org.omg.IOP;
 
 import gnu.CORBA.Minor;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
@@ -57,42 +58,30 @@ import org.omg.CORBA.portable.OutputStream;
 public abstract class IORHelper
 {
   /**
-   * The cached typecode value, computed only once.
-   */
-  private static TypeCode typeCode;
-
-  /**
-   * Create the IOR typecode (structure,
-   * named "IOR").
-   * The typecode states that the structure contains the
-   * following fields: type_id, profiles.
+   * Create the IOR typecode (structure, named "IOR"). The typecode states that
+   * the structure contains the following fields: type_id, profiles.
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      {
-        ORB orb = ORB.init();
-        StructMember[] members = new StructMember[ 2 ];
+    ORB orb = OrbRestricted.Singleton;
+    StructMember[] members = new StructMember[2];
 
-        TypeCode field;
+    TypeCode field;
 
-        field = orb.get_primitive_tc(TCKind.tk_string);
-        members [ 0 ] = new StructMember("type_id", field, null);
+    field = orb.get_primitive_tc(TCKind.tk_string);
+    members[0] = new StructMember("type_id", field, null);
 
-        field = orb.create_sequence_tc(0, TaggedProfileHelper.type());
-        members [ 1 ] = new StructMember("profiles", field, null);
-        typeCode = orb.create_struct_tc(id(), "IOR", members);
-      }
-    return typeCode;
+    field = orb.create_sequence_tc(0, TaggedProfileHelper.type());
+    members[1] = new StructMember("profiles", field, null);
+    return orb.create_struct_tc(id(), "IOR", members);
   }
 
   /**
-  * Insert the IOR into the given Any.
-  * This method uses the IORHolder.
-  *
-  * @param any the Any to insert into.
-  * @param that the IOR to insert.
-  */
+   * Insert the IOR into the given Any. This method uses the IORHolder.
+   * 
+   * @param any the Any to insert into.
+   * @param that the IOR to insert.
+   */
   public static void insert(Any any, IOR that)
   {
     any.insert_Streamable(new IORHolder(that));
diff --git a/org/omg/IOP/MultipleComponentProfileHelper.java b/org/omg/IOP/MultipleComponentProfileHelper.java
index 6f5156fe2..1c04ec54f 100644
--- a/org/omg/IOP/MultipleComponentProfileHelper.java
+++ b/org/omg/IOP/MultipleComponentProfileHelper.java
@@ -39,6 +39,7 @@ exception statement from your version. */
 package org.omg.IOP;
 
 import gnu.CORBA.Minor;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.ORB;
 import org.omg.CORBA.Any;
@@ -57,24 +58,15 @@ import org.omg.CORBA.portable.InputStream;
  */
 public abstract class MultipleComponentProfileHelper
 {
-  /**
-   * The cached typecode value, computed only once.
-   */
-  private static TypeCode typeCode;
-
   public static TypeCode type()
   {
-    if (typeCode == null)
-      {
-        ORB orb = ORB.init();
-        typeCode = orb.create_sequence_tc(0, TaggedComponentHelper.type());
-      }
-    return typeCode;
+    ORB orb = OrbRestricted.Singleton;
+    return orb.create_sequence_tc(0, TaggedComponentHelper.type());
   }
   /**
-   * Insert the MultipleComponentProfile into the given Any.
-   * This method uses the MultipleComponentProfileHolder.
-   *
+   * Insert the MultipleComponentProfile into the given Any. This method uses
+   * the MultipleComponentProfileHolder.
+   * 
    * @param any the Any to insert into.
    * @param those the TaggedComponent[] to insert.
    */
diff --git a/org/omg/IOP/ProfileIdHelper.java b/org/omg/IOP/ProfileIdHelper.java
index 2e3c8f08d..340fa27d5 100644
--- a/org/omg/IOP/ProfileIdHelper.java
+++ b/org/omg/IOP/ProfileIdHelper.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package org.omg.IOP;
 
+import gnu.CORBA.OrbRestricted;
+
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
 import org.omg.CORBA.ORB;
@@ -65,15 +67,14 @@ public abstract class ProfileIdHelper
    */
   public static TypeCode type()
   {
-    ORB orb = ORB.init();
+    ORB orb = OrbRestricted.Singleton;
     return orb.create_alias_tc("IDL:omg.org/IOP/ProfileId:1.0", "ProfileId",
-                               orb.get_primitive_tc(TCKind.tk_ulong)
-                              );
+                               orb.get_primitive_tc(TCKind.tk_ulong));
   }
 
   /**
-  * Insert the int into the given Any.
-  */
+   * Insert the int into the given Any.
+   */
   public static void insert(Any any, int that)
   {
     any.insert_ulong(that);
diff --git a/org/omg/IOP/ServiceContextHelper.java b/org/omg/IOP/ServiceContextHelper.java
index 5693a3235..d6549fa54 100644
--- a/org/omg/IOP/ServiceContextHelper.java
+++ b/org/omg/IOP/ServiceContextHelper.java
@@ -39,6 +39,7 @@ exception statement from your version. */
 package org.omg.IOP;
 
 import gnu.CORBA.Minor;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
@@ -57,46 +58,33 @@ import org.omg.CORBA.portable.OutputStream;
 public abstract class ServiceContextHelper
 {
   /**
-   * The cached typecode value, computed only once.
-   */
-  private static TypeCode typeCode;
-
-  /**
-   * Create the ServiceContext typecode (structure,
-   * named "ServiceContext").
-   * The typecode states that the structure contains the
-   * following fields: context_id, context_data.
+   * Create the ServiceContext typecode (structure, named "ServiceContext"). The
+   * typecode states that the structure contains the following fields:
+   * context_id, context_data.
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      {
-        ORB orb = ORB.init();
-        StructMember[] members = new StructMember[ 2 ];
+    ORB orb = OrbRestricted.Singleton;
+    StructMember[] members = new StructMember[2];
 
-        TypeCode field;
+    TypeCode field;
 
-        field =
-          orb.create_alias_tc("IDL:omg.org/IOP/ServiceId:1.0", "ServiceId",
-                              orb.get_primitive_tc(TCKind.tk_ulong)
-                             );
-        members [ 0 ] = new StructMember("context_id", field, null);
+    field = orb.create_alias_tc("IDL:omg.org/IOP/ServiceId:1.0", "ServiceId",
+                                orb.get_primitive_tc(TCKind.tk_ulong));
+    members[0] = new StructMember("context_id", field, null);
 
-        field =
-          orb.create_sequence_tc(0, orb.get_primitive_tc(TCKind.tk_octet));
-        members [ 1 ] = new StructMember("context_data", field, null);
-        typeCode = orb.create_struct_tc(id(), "ServiceContext", members);
-      }
-    return typeCode;
+    field = orb.create_sequence_tc(0, orb.get_primitive_tc(TCKind.tk_octet));
+    members[1] = new StructMember("context_data", field, null);
+    return orb.create_struct_tc(id(), "ServiceContext", members);
   }
 
   /**
-  * Insert the ServiceContext into the given Any.
-  * This method uses the ServiceContextHolder.
-  *
-  * @param any the Any to insert into.
-  * @param that the ServiceContext to insert.
-  */
+   * Insert the ServiceContext into the given Any. This method uses the
+   * ServiceContextHolder.
+   * 
+   * @param any the Any to insert into.
+   * @param that the ServiceContext to insert.
+   */
   public static void insert(Any any, ServiceContext that)
   {
     any.insert_Streamable(new ServiceContextHolder(that));
diff --git a/org/omg/IOP/ServiceContextListHelper.java b/org/omg/IOP/ServiceContextListHelper.java
index fa436cbb8..7875db29e 100644
--- a/org/omg/IOP/ServiceContextListHelper.java
+++ b/org/omg/IOP/ServiceContextListHelper.java
@@ -39,6 +39,7 @@ exception statement from your version. */
 package org.omg.IOP;
 
 import gnu.CORBA.Minor;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
@@ -56,18 +57,12 @@ import org.omg.CORBA.portable.OutputStream;
 public abstract class ServiceContextListHelper
 {
   /**
-   * The cached {@link ServiceContext[]} typecode, computed once.
-   */
-  private static TypeCode typeCode;
-
-  /**
    * Get the type code of the {@link ServiceContext[]}.
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      typeCode = ORB.init().create_interface_tc(id(), "ServiceContextList");
-    return typeCode;
+    return OrbRestricted.Singleton.create_interface_tc(id(),
+                                                       "ServiceContextList");
   }
 
   /**
diff --git a/org/omg/IOP/ServiceIdHelper.java b/org/omg/IOP/ServiceIdHelper.java
index fac0746a8..084dbd06d 100644
--- a/org/omg/IOP/ServiceIdHelper.java
+++ b/org/omg/IOP/ServiceIdHelper.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package org.omg.IOP;
 
+import gnu.CORBA.OrbRestricted;
+
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
 import org.omg.CORBA.ORB;
@@ -65,7 +67,7 @@ public abstract class ServiceIdHelper
    */
   public static TypeCode type()
   {
-    ORB orb = ORB.init();
+    ORB orb = OrbRestricted.Singleton;
     return orb.create_alias_tc("IDL:omg.org/IOP/ServiceId:1.0", "ServiceId",
                                orb.get_primitive_tc(TCKind.tk_ulong)
                               );
diff --git a/org/omg/IOP/TaggedComponentHelper.java b/org/omg/IOP/TaggedComponentHelper.java
index eaee120f0..633891b9b 100644
--- a/org/omg/IOP/TaggedComponentHelper.java
+++ b/org/omg/IOP/TaggedComponentHelper.java
@@ -39,6 +39,7 @@ exception statement from your version. */
 package org.omg.IOP;
 
 import gnu.CORBA.Minor;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
@@ -60,34 +61,25 @@ import java.io.IOException;
 public abstract class TaggedComponentHelper
 {
   /**
-   * The cached typecode value, computed only once.
-   */
-  private static TypeCode typeCode;
-
-  /**
    * Create the TaggedComponent typecode (structure, named "TaggedComponent").
    * The typecode states that the structure contains the following fields: tag,
    * component_data.
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      {
-        ORB orb = ORB.init();
-        StructMember[] members = new StructMember[2];
-
-        TypeCode field;
-
-        field = orb.create_alias_tc("IDL:omg.org/IOP/ComponentId:1.0",
-                                    "ComponentId",
-                                    orb.get_primitive_tc(TCKind.tk_ulong));
-        members[0] = new StructMember("tag", field, null);
-
-        field = orb.create_sequence_tc(0, orb.get_primitive_tc(TCKind.tk_octet));
-        members[1] = new StructMember("component_data", field, null);
-        typeCode = orb.create_struct_tc(id(), "TaggedComponent", members);
-      }
-    return typeCode;
+    ORB orb = OrbRestricted.Singleton;
+    StructMember[] members = new StructMember[2];
+    
+    TypeCode field;
+    
+    field = orb.create_alias_tc("IDL:omg.org/IOP/ComponentId:1.0",
+                                "ComponentId",
+                                orb.get_primitive_tc(TCKind.tk_ulong));
+    members[0] = new StructMember("tag", field, null);
+    
+    field = orb.create_sequence_tc(0, orb.get_primitive_tc(TCKind.tk_octet));
+    members[1] = new StructMember("component_data", field, null);
+    return orb.create_struct_tc(id(), "TaggedComponent", members);
   }
 
   /**
diff --git a/org/omg/IOP/TaggedProfileHelper.java b/org/omg/IOP/TaggedProfileHelper.java
index 2943657c0..9dbbfdaff 100644
--- a/org/omg/IOP/TaggedProfileHelper.java
+++ b/org/omg/IOP/TaggedProfileHelper.java
@@ -39,6 +39,7 @@ exception statement from your version. */
 package org.omg.IOP;
 
 import gnu.CORBA.Minor;
+import gnu.CORBA.OrbRestricted;
 import gnu.CORBA.CDR.BufferredCdrInput;
 import gnu.CORBA.CDR.BufferedCdrOutput;
 
@@ -62,40 +63,30 @@ import java.io.IOException;
 public abstract class TaggedProfileHelper
 {
   /**
-   * The cached typecode value, computed only once.
-   */
-  private static TypeCode typeCode;
-
-  /**
    * Create the TaggedProfile typecode (structure, named "TaggedProfile"). The
    * typecode states that the structure contains the following fields: tag,
    * profile_data.
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      {
-        ORB orb = ORB.init();
-        StructMember[] members = new StructMember[2];
+    ORB orb = OrbRestricted.Singleton;
+    StructMember[] members = new StructMember[2];
 
-        TypeCode field;
+    TypeCode field;
 
-        field = orb.create_alias_tc("IDL:omg.org/IOP/ProfileId:1.0",
-                                    "ProfileId",
-                                    orb.get_primitive_tc(TCKind.tk_ulong));
-        members[0] = new StructMember("tag", field, null);
+    field = orb.create_alias_tc("IDL:omg.org/IOP/ProfileId:1.0", "ProfileId",
+                                orb.get_primitive_tc(TCKind.tk_ulong));
+    members[0] = new StructMember("tag", field, null);
 
-        field = orb.create_sequence_tc(0, orb.get_primitive_tc(TCKind.tk_octet));
-        members[1] = new StructMember("profile_data", field, null);
-        typeCode = orb.create_struct_tc(id(), "TaggedProfile", members);
-      }
-    return typeCode;
+    field = orb.create_sequence_tc(0, orb.get_primitive_tc(TCKind.tk_octet));
+    members[1] = new StructMember("profile_data", field, null);
+    return orb.create_struct_tc(id(), "TaggedProfile", members);
   }
 
   /**
    * Insert the TaggedProfile into the given Any. This method uses the
    * TaggedProfileHolder.
-   *
+   * 
    * @param any the Any to insert into.
    * @param that the TaggedProfile to insert.
    */
diff --git a/org/omg/PortableInterceptor/AdapterManagerIdHelper.java b/org/omg/PortableInterceptor/AdapterManagerIdHelper.java
index f3f7e6441..936e6bc1b 100644
--- a/org/omg/PortableInterceptor/AdapterManagerIdHelper.java
+++ b/org/omg/PortableInterceptor/AdapterManagerIdHelper.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package org.omg.PortableInterceptor;
 
+import gnu.CORBA.OrbRestricted;
+
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
 import org.omg.CORBA.ORB;
@@ -57,15 +59,14 @@ import org.omg.CORBA.portable.OutputStream;
 public abstract class AdapterManagerIdHelper
 {
   /**
-   * Create the AdapterManagerId typecode (alias of CORBA long (java int),
-   * named "AdapterManagerId").
+   * Create the AdapterManagerId typecode (alias of CORBA long (java int), named
+   * "AdapterManagerId").
    */
   public static TypeCode type()
   {
-    ORB orb = ORB.init();
+    ORB orb = OrbRestricted.Singleton;
     return orb.create_alias_tc(id(), "AdapterManagerId",
-                               orb.get_primitive_tc(TCKind.tk_long)
-                              );
+                               orb.get_primitive_tc(TCKind.tk_long));
   }
 
   /**
diff --git a/org/omg/PortableInterceptor/AdapterNameHelper.java b/org/omg/PortableInterceptor/AdapterNameHelper.java
index 1cda311b2..05844560a 100644
--- a/org/omg/PortableInterceptor/AdapterNameHelper.java
+++ b/org/omg/PortableInterceptor/AdapterNameHelper.java
@@ -61,11 +61,6 @@ public abstract class AdapterNameHelper
 {
   
   /**
-   * The cached typecode, computed once.
-   */
-  static TypeCode typecode;
-  
-  /**
    * Extract the adapter name (<code>String[]</code>) from the given {@link Any}.
    *
    * @param a an Any to extract the array from.
@@ -114,26 +109,22 @@ public abstract class AdapterNameHelper
   }
 
   /**
-   * Creates and returns a new instance of the TypeCode,
-   * corresponding the adapter name.
+   * Creates and returns a new instance of the TypeCode, corresponding the
+   * adapter name.
    * 
    * @return the alias of the string sequence, named "AdapterName".
    */
   public static TypeCode type()
   {
-    if (typecode == null)
-      {
-        ORB orb = OrbRestricted.Singleton;
-        
-        TypeCode component = orb.create_string_tc(0);
-        typecode = orb.create_alias_tc(id(), "AdapterName", component);
-      }
-    return typecode;
+    ORB orb = OrbRestricted.Singleton;
+
+    TypeCode component = orb.create_string_tc(0);
+    return orb.create_alias_tc(id(), "AdapterName", component);
   }
 
   /**
    * Writes the <code>String[]</code> into the given stream.
-   *
+   * 
    * @param output the CORBA output stream to write.
    * @param value the value that must be written.
    */
diff --git a/org/omg/PortableInterceptor/AdapterStateHelper.java b/org/omg/PortableInterceptor/AdapterStateHelper.java
index ceb7ac8d5..f0522caac 100644
--- a/org/omg/PortableInterceptor/AdapterStateHelper.java
+++ b/org/omg/PortableInterceptor/AdapterStateHelper.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package org.omg.PortableInterceptor;
 
+import gnu.CORBA.OrbRestricted;
+
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
 import org.omg.CORBA.ORB;
@@ -62,7 +64,7 @@ public abstract class AdapterStateHelper
    */
   public static TypeCode type()
   {
-    ORB orb = ORB.init();
+    ORB orb = OrbRestricted.Singleton;
     return orb.create_alias_tc(id(), "AdapterState",
                                orb.get_primitive_tc(TCKind.tk_short)
                               );
diff --git a/org/omg/PortableInterceptor/CurrentHelper.java b/org/omg/PortableInterceptor/CurrentHelper.java
index df3bcaef7..e453f6010 100644
--- a/org/omg/PortableInterceptor/CurrentHelper.java
+++ b/org/omg/PortableInterceptor/CurrentHelper.java
@@ -39,6 +39,7 @@ exception statement from your version. */
 package org.omg.PortableInterceptor;
 
 import gnu.CORBA.Minor;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_PARAM;
@@ -57,20 +58,11 @@ import org.omg.PortableServer.ServantActivator;
 public abstract class CurrentHelper
 {
   /**
-   * The cached {@link Current} typecode, computed once.
-   */
-  private static TypeCode typeCode;
-
-  /**
    * Get the type code of the {@link Current}.
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      {
-        typeCode = ORB.init().create_interface_tc(id(), "Current");
-      }
-    return typeCode;
+    return OrbRestricted.Singleton.create_interface_tc(id(), "Current");
   }
 
   /**
diff --git a/org/omg/PortableInterceptor/ForwardRequestHelper.java b/org/omg/PortableInterceptor/ForwardRequestHelper.java
index 5db56d745..8aa19a991 100644
--- a/org/omg/PortableInterceptor/ForwardRequestHelper.java
+++ b/org/omg/PortableInterceptor/ForwardRequestHelper.java
@@ -39,6 +39,7 @@ exception statement from your version. */
 package org.omg.PortableInterceptor;
 
 import gnu.CORBA.Minor;
+import gnu.CORBA.OrbRestricted;
 import gnu.CORBA.Interceptor.ForwardRequestHolder;
 
 import org.omg.CORBA.Any;
@@ -58,32 +59,23 @@ import org.omg.CORBA.portable.OutputStream;
 public abstract class ForwardRequestHelper
 {
   /**
-   * The cached typecode value, computed only once.
-   */
-  private static TypeCode typeCode;
-
-  /**
-       * Create the ForwardRequest typecode (structure, named "ForwardRequest"). The
+   * Create the ForwardRequest typecode (structure, named "ForwardRequest"). The
    * typecode states that the structure contains the following fields: forward.
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      {
-        ORB orb = ORB.init();
-        StructMember[] members = new StructMember[ 1 ];
+    ORB orb = OrbRestricted.Singleton;
+    StructMember[] members = new StructMember[1];
 
-        TypeCode field = ObjectHelper.type();
-        members [ 0 ] = new StructMember("forward", field, null);
-        typeCode = orb.create_exception_tc(id(), "ForwardRequest", members);
-      }
-    return typeCode;
+    TypeCode field = ObjectHelper.type();
+    members[0] = new StructMember("forward", field, null);
+    return orb.create_exception_tc(id(), "ForwardRequest", members);
   }
 
   /**
    * Insert the ForwardRequest into the given Any. This method uses the
    * ForwardRequestHolder.
-   *
+   * 
    * @param any the Any to insert into.
    * @param that the ForwardRequest to insert.
    */
diff --git a/org/omg/PortableInterceptor/IORInterceptor_3_0Helper.java b/org/omg/PortableInterceptor/IORInterceptor_3_0Helper.java
index 565242477..926974f1a 100644
--- a/org/omg/PortableInterceptor/IORInterceptor_3_0Helper.java
+++ b/org/omg/PortableInterceptor/IORInterceptor_3_0Helper.java
@@ -39,6 +39,7 @@ exception statement from your version. */
 package org.omg.PortableInterceptor;
 
 import gnu.CORBA.Minor;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
@@ -60,18 +61,12 @@ import org.omg.CORBA.portable.OutputStream;
 public abstract class IORInterceptor_3_0Helper
 {
   /**
-   * The cached {@link IORInterceptor_3_0} typecode, computed once.
-   */
-  private static TypeCode typeCode;
-
-  /**
    * Get the type code of the {@link IORInterceptor_3_0}.
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      typeCode = ORB.init().create_interface_tc(id(), "IORInterceptor_3_0");
-    return typeCode;
+    return OrbRestricted.Singleton.create_interface_tc(id(), 
+      "IORInterceptor_3_0");
   }
 
   /**
diff --git a/org/omg/PortableInterceptor/InvalidSlotHelper.java b/org/omg/PortableInterceptor/InvalidSlotHelper.java
index 98b259677..28558a000 100644
--- a/org/omg/PortableInterceptor/InvalidSlotHelper.java
+++ b/org/omg/PortableInterceptor/InvalidSlotHelper.java
@@ -40,6 +40,7 @@ package org.omg.PortableInterceptor;
 
 import gnu.CORBA.EmptyExceptionHolder;
 import gnu.CORBA.Minor;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
@@ -57,22 +58,13 @@ import org.omg.CORBA.portable.OutputStream;
 public abstract class InvalidSlotHelper
 {
   /**
-   * The cached typecode value, computed only once.
-   */
-  private static TypeCode typeCode;
-
-  /**
    * Create the InvalidSlot typecode (structure, named "InvalidSlot").
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      {
-        ORB orb = ORB.init();
-        StructMember[] members = new StructMember[ 0 ];
-        typeCode = orb.create_exception_tc(id(), "InvalidSlot", members);
-      }
-    return typeCode;
+    ORB orb = OrbRestricted.Singleton;
+    StructMember[] members = new StructMember[0];
+    return orb.create_exception_tc(id(), "InvalidSlot", members);
   }
 
   /*
diff --git a/org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateNameHelper.java b/org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateNameHelper.java
index 648e9679b..2d9740a85 100644
--- a/org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateNameHelper.java
+++ b/org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateNameHelper.java
@@ -57,36 +57,25 @@ import org.omg.CORBA.portable.OutputStream;
 public abstract class DuplicateNameHelper
 {
   /**
-   * The cached typecode value, computed only once.
-   */
-  private static TypeCode typeCode;
-
-  /**
-   * Create the DuplicateName typecode (structure,
-   * named "DuplicateName").
-   * The typecode states that the structure contains the
-   * following fields: name.
+   * Create the DuplicateName typecode (structure, named "DuplicateName"). The
+   * typecode states that the structure contains the following fields: name.
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      {
-        ORB orb = ORB.init();
-        StructMember[] members = new StructMember[ 1 ];
+    ORB orb = OrbRestricted.Singleton;
+    StructMember[] members = new StructMember[1];
 
-        TypeCode field;
+    TypeCode field;
 
-        field = orb.get_primitive_tc(TCKind.tk_string);
-        members [ 0 ] = new StructMember("name", field, null);
-        typeCode = orb.create_exception_tc(id(), "DuplicateName", members);
-      }
-    return typeCode;
+    field = orb.get_primitive_tc(TCKind.tk_string);
+    members[0] = new StructMember("name", field, null);
+    return orb.create_exception_tc(id(), "DuplicateName", members);
   }
 
   /**
-   * Insert the DuplicateName into the given Any.
-   * This method uses the DuplicateNameHolder.
-   *
+   * Insert the DuplicateName into the given Any. This method uses the
+   * DuplicateNameHolder.
+   * 
    * @param any the Any to insert into.
    * @param that the DuplicateName to insert.
    */
diff --git a/org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidNameHelper.java b/org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidNameHelper.java
index f89f9d4c6..a87a3b747 100644
--- a/org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidNameHelper.java
+++ b/org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidNameHelper.java
@@ -40,6 +40,7 @@ package org.omg.PortableInterceptor.ORBInitInfoPackage;
 
 import gnu.CORBA.EmptyExceptionHolder;
 import gnu.CORBA.Minor;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
@@ -58,28 +59,18 @@ import org.omg.CORBA.portable.OutputStream;
 public abstract class InvalidNameHelper
 {
   /**
-   * The cached typecode value, computed only once.
-   */
-  private static TypeCode typeCode;
-
-  /**
-   * Create the InvalidName typecode (structure,
-   * named "InvalidName").
+   * Create the InvalidName typecode (structure, named "InvalidName").
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      {
-        ORB orb = ORB.init();
-        StructMember[] members = new StructMember[ 0 ];
-        typeCode = orb.create_exception_tc(id(), "InvalidName", members);
-      }
-    return typeCode;
+    ORB orb = OrbRestricted.Singleton;
+    StructMember[] members = new StructMember[0];
+    return orb.create_exception_tc(id(), "InvalidName", members);
   }
 
   /**
    * Insert the InvalidName into the given Any.
-   *
+   * 
    * @param any the Any to insert into.
    * @param that the InvalidName to insert.
    */
diff --git a/org/omg/PortableInterceptor/ObjectReferenceFactoryHelper.java b/org/omg/PortableInterceptor/ObjectReferenceFactoryHelper.java
index 55ee0be18..72c864811 100644
--- a/org/omg/PortableInterceptor/ObjectReferenceFactoryHelper.java
+++ b/org/omg/PortableInterceptor/ObjectReferenceFactoryHelper.java
@@ -40,6 +40,7 @@ package org.omg.PortableInterceptor;
 
 import gnu.CORBA.CDR.Vio;
 import gnu.CORBA.Minor;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
@@ -60,24 +61,16 @@ import org.omg.CORBA.VM_ABSTRACT;
 public abstract class ObjectReferenceFactoryHelper
 {
   /**
-   * The cached {@link ObjectReferenceFactory} typecode, computed once.
-   */
-  private static TypeCode typeCode;
-
-  /**
    * Get the type code of the {@link ObjectReferenceFactory}.
-   *
-   * @return value type code with the agreed id, named
-   * "ObjectReferenceFactory", abstract, no members, no base type.
+   * 
+   * @return value type code with the agreed id, named "ObjectReferenceFactory",
+   *         abstract, no members, no base type.
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      typeCode =
-        ORB.init().create_value_tc(id(), "ObjectReferenceFactory",
-          VM_ABSTRACT.value, null, new ValueMember[ 0 ]
-        );
-    return typeCode;
+    return OrbRestricted.Singleton.create_value_tc(id(), "ObjectReferenceFactory",
+                                      VM_ABSTRACT.value, null,
+                                      new ValueMember[0]);
   }
 
   /**
diff --git a/org/omg/PortableInterceptor/ObjectReferenceTemplateHelper.java b/org/omg/PortableInterceptor/ObjectReferenceTemplateHelper.java
index 258a73ae8..014c11308 100644
--- a/org/omg/PortableInterceptor/ObjectReferenceTemplateHelper.java
+++ b/org/omg/PortableInterceptor/ObjectReferenceTemplateHelper.java
@@ -39,6 +39,7 @@ exception statement from your version. */
 package org.omg.PortableInterceptor;
 
 import gnu.CORBA.Minor;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
@@ -58,24 +59,16 @@ import org.omg.CORBA.portable.OutputStream;
 public abstract class ObjectReferenceTemplateHelper
 {
   /**
-   * The cached {@link ObjectReferenceTemplate} typecode, computed once.
-   */
-  private static TypeCode typeCode;
-
-  /**
    * Get the type code of the {@link ObjectReferenceTemplate}.
-   *
-   * @return value type type code, named ObjectReferenceTemplate,
-   * no members, abstract.
+   * 
+   * @return value type type code, named ObjectReferenceTemplate, no members,
+   *         abstract.
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      typeCode =
-        ORB.init().create_value_tc(id(), "ObjectReferenceTemplate",
-          VM_ABSTRACT.value, null, new ValueMember[ 0 ]
-        );
-    return typeCode;
+    return OrbRestricted.Singleton.create_value_tc(id(), "ObjectReferenceTemplate",
+                                      VM_ABSTRACT.value, null,
+                                      new ValueMember[0]);
   }
 
   /**
diff --git a/org/omg/PortableInterceptor/ObjectReferenceTemplateSeqHelper.java b/org/omg/PortableInterceptor/ObjectReferenceTemplateSeqHelper.java
index c4f09896f..e84f3e6be 100644
--- a/org/omg/PortableInterceptor/ObjectReferenceTemplateSeqHelper.java
+++ b/org/omg/PortableInterceptor/ObjectReferenceTemplateSeqHelper.java
@@ -57,11 +57,6 @@ import org.omg.CORBA.portable.Streamable;
 public abstract class ObjectReferenceTemplateSeqHelper
 {
   /**
-   * The type code, computed once.
-   */
-  static TypeCode typecode;
-
-  /**
    * Extract the <code>ObjectReferenceTemplate[]</code> from the given
    * {@link Any}. This implementation expects the {@link Any} to hold the
    * instance of {@link ObjectReferenceTemplateSeqHolder} that is returned by
@@ -142,15 +137,11 @@ public abstract class ObjectReferenceTemplateSeqHelper
    */
   public static TypeCode type()
   {
-    if (typecode == null)
-      {
-        GeneralTypeCode t = new GeneralTypeCode(TCKind.tk_sequence);
-        t.setId(id());
-        t.setLength(0);
-        t.setContentType(ObjectReferenceTemplateHelper.type());
-        typecode = t;
-      }
-    return typecode;
+    GeneralTypeCode t = new GeneralTypeCode(TCKind.tk_sequence);
+    t.setId(id());
+    t.setLength(0);
+    t.setContentType(ObjectReferenceTemplateHelper.type());
+    return t;
   }
 
   /**
diff --git a/org/omg/PortableServer/CurrentHelper.java b/org/omg/PortableServer/CurrentHelper.java
index 281cefa6d..3afbf669b 100644
--- a/org/omg/PortableServer/CurrentHelper.java
+++ b/org/omg/PortableServer/CurrentHelper.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package org.omg.PortableServer;
 
+import gnu.CORBA.OrbRestricted;
+
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_PARAM;
 import org.omg.CORBA.NO_IMPLEMENT;
@@ -61,7 +63,7 @@ public abstract class CurrentHelper
    */
   public static TypeCode type()
   {
-    return ORB.init().create_interface_tc(id(), "Current");
+    return OrbRestricted.Singleton.create_interface_tc(id(), "Current");
   }
 
   /**
diff --git a/org/omg/PortableServer/CurrentPackage/NoContextHelper.java b/org/omg/PortableServer/CurrentPackage/NoContextHelper.java
index 848a3c3d3..02c74c535 100644
--- a/org/omg/PortableServer/CurrentPackage/NoContextHelper.java
+++ b/org/omg/PortableServer/CurrentPackage/NoContextHelper.java
@@ -40,6 +40,7 @@ package org.omg.PortableServer.CurrentPackage;
 
 import gnu.CORBA.EmptyExceptionHolder;
 import gnu.CORBA.Minor;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
@@ -58,26 +59,19 @@ import org.omg.CORBA.portable.OutputStream;
 public abstract class NoContextHelper
 {
   /**
-   * The cached typecode value, computed only once.
-   */
-  private static TypeCode typeCode;
-
-  /**
-   * Create the NoContext typecode (structure,
-   * named "NoContext").
+   * Create the NoContext typecode (structure, named "NoContext").
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      {
-        ORB orb = ORB.init();
-        StructMember[] members = new StructMember[ 0 ];
-        typeCode = orb.create_exception_tc(id(), "NoContext", members);
-      }
-    return typeCode;
+    ORB orb = OrbRestricted.Singleton;
+    StructMember[] members = new StructMember[0];
+    return orb.create_exception_tc(id(), "NoContext", members);
   }
 
-  /* Every user exception with no user defined fields can use EmptyExceptionHolder */
+  /*
+   * Every user exception with no user defined fields can use
+   * EmptyExceptionHolder
+   */
 
   /**
    * Insert the NoContext into the given Any.
diff --git a/org/omg/PortableServer/ForwardRequestHelper.java b/org/omg/PortableServer/ForwardRequestHelper.java
index f4b0619b0..b30a2abeb 100644
--- a/org/omg/PortableServer/ForwardRequestHelper.java
+++ b/org/omg/PortableServer/ForwardRequestHelper.java
@@ -39,6 +39,7 @@ exception statement from your version. */
 package org.omg.PortableServer;
 
 import gnu.CORBA.Minor;
+import gnu.CORBA.OrbRestricted;
 import gnu.CORBA.Poa.ForwardRequestHolder;
 
 import org.omg.CORBA.Any;
@@ -62,11 +63,6 @@ import org.omg.CORBA.portable.OutputStream;
 public abstract class ForwardRequestHelper
 {
   /**
-   * The cached typecode value, computed only once.
-   */
-  private static TypeCode typeCode;
-
-  /**
    * Extract the ForwardRequest from given Any.
    * This method uses the ForwardRequestHolder.
    *
@@ -132,18 +128,14 @@ public abstract class ForwardRequestHelper
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      {
-        ORB orb = ORB.init();
+        ORB orb = OrbRestricted.Singleton;
         StructMember[] members = new StructMember[ 1 ];
 
         TypeCode field;
 
         field = ObjectHelper.type();
         members [ 0 ] = new StructMember("forward_reference", field, null);
-        typeCode = orb.create_exception_tc(id(), "ForwardRequest", members);
-      }
-    return typeCode;
+        return orb.create_exception_tc(id(), "ForwardRequest", members);
   }
 
   /**
diff --git a/org/omg/PortableServer/POAHelper.java b/org/omg/PortableServer/POAHelper.java
index 3712da00d..d6a951be5 100644
--- a/org/omg/PortableServer/POAHelper.java
+++ b/org/omg/PortableServer/POAHelper.java
@@ -39,6 +39,7 @@ exception statement from your version. */
 package org.omg.PortableServer;
 
 import gnu.CORBA.Minor;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.BAD_PARAM;
 import org.omg.CORBA.TypeCode;
@@ -80,7 +81,7 @@ public abstract class POAHelper
    */
   public static TypeCode type()
   {
-    return ORB.init().create_interface_tc(id(), "POA");
+    return OrbRestricted.Singleton.create_interface_tc(id(), "POA");
   }
 
   /**
diff --git a/org/omg/PortableServer/POAManagerPackage/AdapterInactiveHelper.java b/org/omg/PortableServer/POAManagerPackage/AdapterInactiveHelper.java
index 2a587a412..e23d11997 100644
--- a/org/omg/PortableServer/POAManagerPackage/AdapterInactiveHelper.java
+++ b/org/omg/PortableServer/POAManagerPackage/AdapterInactiveHelper.java
@@ -40,6 +40,7 @@ package org.omg.PortableServer.POAManagerPackage;
 
 import gnu.CORBA.EmptyExceptionHolder;
 import gnu.CORBA.Minor;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
@@ -58,23 +59,14 @@ import org.omg.CORBA.portable.OutputStream;
 public abstract class AdapterInactiveHelper
 {
   /**
-   * The cached typecode value, computed only once.
-   */
-  private static TypeCode typeCode;
-
-  /**
    * Create the AdapterInactive typecode (structure,
    * named "AdapterInactive").
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      {
-        ORB orb = ORB.init();
-        StructMember[] members = new StructMember[ 0 ];
-        typeCode = orb.create_exception_tc(id(), "AdapterInactive", members);
-      }
-    return typeCode;
+    ORB orb = OrbRestricted.Singleton;
+    StructMember[] members = new StructMember[ 0 ];
+    return orb.create_exception_tc(id(), "AdapterInactive", members);
   }
 
   /* Every user exception with no user defined
diff --git a/org/omg/PortableServer/POAPackage/AdapterAlreadyExistsHelper.java b/org/omg/PortableServer/POAPackage/AdapterAlreadyExistsHelper.java
index 61a410891..f616637ae 100644
--- a/org/omg/PortableServer/POAPackage/AdapterAlreadyExistsHelper.java
+++ b/org/omg/PortableServer/POAPackage/AdapterAlreadyExistsHelper.java
@@ -40,6 +40,7 @@ package org.omg.PortableServer.POAPackage;
 
 import gnu.CORBA.EmptyExceptionHolder;
 import gnu.CORBA.Minor;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
@@ -70,7 +71,7 @@ public abstract class AdapterAlreadyExistsHelper
   {
     if (typeCode == null)
       {
-        ORB orb = ORB.init();
+        ORB orb = OrbRestricted.Singleton;
         StructMember[] members = new StructMember[ 0 ];
         typeCode =
           orb.create_exception_tc(id(), "AdapterAlreadyExists", members);
diff --git a/org/omg/PortableServer/POAPackage/AdapterNonExistentHelper.java b/org/omg/PortableServer/POAPackage/AdapterNonExistentHelper.java
index dd318bf09..bad920a5a 100644
--- a/org/omg/PortableServer/POAPackage/AdapterNonExistentHelper.java
+++ b/org/omg/PortableServer/POAPackage/AdapterNonExistentHelper.java
@@ -40,6 +40,7 @@ package org.omg.PortableServer.POAPackage;
 
 import gnu.CORBA.EmptyExceptionHolder;
 import gnu.CORBA.Minor;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
@@ -70,7 +71,7 @@ public abstract class AdapterNonExistentHelper
   {
     if (typeCode == null)
       {
-        ORB orb = ORB.init();
+        ORB orb = OrbRestricted.Singleton;
         StructMember[] members = new StructMember[ 0 ];
         typeCode = orb.create_exception_tc(id(), "AdapterNonExistent", members);
       }
diff --git a/org/omg/PortableServer/POAPackage/InvalidPolicyHelper.java b/org/omg/PortableServer/POAPackage/InvalidPolicyHelper.java
index 5e9e627c7..32ddae858 100644
--- a/org/omg/PortableServer/POAPackage/InvalidPolicyHelper.java
+++ b/org/omg/PortableServer/POAPackage/InvalidPolicyHelper.java
@@ -39,6 +39,7 @@ exception statement from your version. */
 package org.omg.PortableServer.POAPackage;
 
 import gnu.CORBA.Minor;
+import gnu.CORBA.OrbRestricted;
 import gnu.CORBA.Poa.InvalidPolicyHolder;
 
 import org.omg.CORBA.Any;
@@ -72,7 +73,7 @@ public abstract class InvalidPolicyHelper
   {
     if (typeCode == null)
       {
-        ORB orb = ORB.init();
+        ORB orb = OrbRestricted.Singleton;
         StructMember[] members = new StructMember[ 1 ];
 
         TypeCode field;
diff --git a/org/omg/PortableServer/POAPackage/NoServantHelper.java b/org/omg/PortableServer/POAPackage/NoServantHelper.java
index fd2c189fc..b9afb8ed7 100644
--- a/org/omg/PortableServer/POAPackage/NoServantHelper.java
+++ b/org/omg/PortableServer/POAPackage/NoServantHelper.java
@@ -40,6 +40,7 @@ package org.omg.PortableServer.POAPackage;
 
 import gnu.CORBA.EmptyExceptionHolder;
 import gnu.CORBA.Minor;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
@@ -70,7 +71,7 @@ public abstract class NoServantHelper
   {
     if (typeCode == null)
       {
-        ORB orb = ORB.init();
+        ORB orb = OrbRestricted.Singleton;
         StructMember[] members = new StructMember[ 0 ];
         typeCode = orb.create_exception_tc(id(), "NoServant", members);
       }
diff --git a/org/omg/PortableServer/POAPackage/ObjectAlreadyActiveHelper.java b/org/omg/PortableServer/POAPackage/ObjectAlreadyActiveHelper.java
index 011867473..bf5e9cd9e 100644
--- a/org/omg/PortableServer/POAPackage/ObjectAlreadyActiveHelper.java
+++ b/org/omg/PortableServer/POAPackage/ObjectAlreadyActiveHelper.java
@@ -40,6 +40,7 @@ package org.omg.PortableServer.POAPackage;
 
 import gnu.CORBA.EmptyExceptionHolder;
 import gnu.CORBA.Minor;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
@@ -70,7 +71,7 @@ public abstract class ObjectAlreadyActiveHelper
   {
     if (typeCode == null)
       {
-        ORB orb = ORB.init();
+        ORB orb = OrbRestricted.Singleton;
         StructMember[] members = new StructMember[ 0 ];
         typeCode =
           orb.create_exception_tc(id(), "ObjectAlreadyActive", members);
diff --git a/org/omg/PortableServer/POAPackage/ObjectNotActiveHelper.java b/org/omg/PortableServer/POAPackage/ObjectNotActiveHelper.java
index 0d8ff473c..2f5867cbd 100644
--- a/org/omg/PortableServer/POAPackage/ObjectNotActiveHelper.java
+++ b/org/omg/PortableServer/POAPackage/ObjectNotActiveHelper.java
@@ -40,6 +40,7 @@ package org.omg.PortableServer.POAPackage;
 
 import gnu.CORBA.EmptyExceptionHolder;
 import gnu.CORBA.Minor;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
@@ -70,7 +71,7 @@ public abstract class ObjectNotActiveHelper
   {
     if (typeCode == null)
       {
-        ORB orb = ORB.init();
+        ORB orb = OrbRestricted.Singleton;
         StructMember[] members = new StructMember[ 0 ];
         typeCode = orb.create_exception_tc(id(), "ObjectNotActive", members);
       }
diff --git a/org/omg/PortableServer/POAPackage/ServantAlreadyActiveHelper.java b/org/omg/PortableServer/POAPackage/ServantAlreadyActiveHelper.java
index a74e67401..33ca06674 100644
--- a/org/omg/PortableServer/POAPackage/ServantAlreadyActiveHelper.java
+++ b/org/omg/PortableServer/POAPackage/ServantAlreadyActiveHelper.java
@@ -40,6 +40,7 @@ package org.omg.PortableServer.POAPackage;
 
 import gnu.CORBA.EmptyExceptionHolder;
 import gnu.CORBA.Minor;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
@@ -70,7 +71,7 @@ public abstract class ServantAlreadyActiveHelper
   {
     if (typeCode == null)
       {
-        ORB orb = ORB.init();
+        ORB orb = OrbRestricted.Singleton;
         StructMember[] members = new StructMember[ 0 ];
         typeCode =
           orb.create_exception_tc(id(), "ServantAlreadyActive", members);
diff --git a/org/omg/PortableServer/POAPackage/ServantNotActiveHelper.java b/org/omg/PortableServer/POAPackage/ServantNotActiveHelper.java
index 5fb52cf35..e86f4e948 100644
--- a/org/omg/PortableServer/POAPackage/ServantNotActiveHelper.java
+++ b/org/omg/PortableServer/POAPackage/ServantNotActiveHelper.java
@@ -40,6 +40,7 @@ package org.omg.PortableServer.POAPackage;
 
 import gnu.CORBA.EmptyExceptionHolder;
 import gnu.CORBA.Minor;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
@@ -70,7 +71,7 @@ public abstract class ServantNotActiveHelper
   {
     if (typeCode == null)
       {
-        ORB orb = ORB.init();
+        ORB orb = OrbRestricted.Singleton;
         StructMember[] members = new StructMember[ 0 ];
         typeCode = orb.create_exception_tc(id(), "ServantNotActive", members);
       }
diff --git a/org/omg/PortableServer/POAPackage/WrongAdapterHelper.java b/org/omg/PortableServer/POAPackage/WrongAdapterHelper.java
index cd862b081..7650014c1 100644
--- a/org/omg/PortableServer/POAPackage/WrongAdapterHelper.java
+++ b/org/omg/PortableServer/POAPackage/WrongAdapterHelper.java
@@ -40,6 +40,7 @@ package org.omg.PortableServer.POAPackage;
 
 import gnu.CORBA.EmptyExceptionHolder;
 import gnu.CORBA.Minor;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
@@ -70,7 +71,7 @@ public abstract class WrongAdapterHelper
   {
     if (typeCode == null)
       {
-        ORB orb = ORB.init();
+        ORB orb = OrbRestricted.Singleton;
         StructMember[] members = new StructMember[ 0 ];
         typeCode = orb.create_exception_tc(id(), "WrongAdapter", members);
       }
diff --git a/org/omg/PortableServer/POAPackage/WrongPolicyHelper.java b/org/omg/PortableServer/POAPackage/WrongPolicyHelper.java
index a1f27cbb0..a9e7fc594 100644
--- a/org/omg/PortableServer/POAPackage/WrongPolicyHelper.java
+++ b/org/omg/PortableServer/POAPackage/WrongPolicyHelper.java
@@ -40,6 +40,7 @@ package org.omg.PortableServer.POAPackage;
 
 import gnu.CORBA.EmptyExceptionHolder;
 import gnu.CORBA.Minor;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
@@ -70,7 +71,7 @@ public abstract class WrongPolicyHelper
   {
     if (typeCode == null)
       {
-        ORB orb = ORB.init();
+        ORB orb = OrbRestricted.Singleton;
         StructMember[] members = new StructMember[ 0 ];
         typeCode = orb.create_exception_tc(id(), "WrongPolicy", members);
       }
diff --git a/org/omg/PortableServer/ServantActivatorHelper.java b/org/omg/PortableServer/ServantActivatorHelper.java
index 8aa58b2f6..e1c4f09c8 100644
--- a/org/omg/PortableServer/ServantActivatorHelper.java
+++ b/org/omg/PortableServer/ServantActivatorHelper.java
@@ -39,6 +39,7 @@ exception statement from your version. */
 package org.omg.PortableServer;
 
 import gnu.CORBA.Minor;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
@@ -61,7 +62,7 @@ public abstract class ServantActivatorHelper
    */
   public static TypeCode type()
   {
-    return ORB.init().create_interface_tc(id(), "ServantActivator");
+    return OrbRestricted.Singleton.create_interface_tc(id(), "ServantActivator");
   }
 
   /**
diff --git a/org/omg/PortableServer/ServantLocatorHelper.java b/org/omg/PortableServer/ServantLocatorHelper.java
index 082c4c586..7bb933f7b 100644
--- a/org/omg/PortableServer/ServantLocatorHelper.java
+++ b/org/omg/PortableServer/ServantLocatorHelper.java
@@ -39,6 +39,7 @@ exception statement from your version. */
 package org.omg.PortableServer;
 
 import gnu.CORBA.Minor;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
@@ -60,7 +61,7 @@ public abstract class ServantLocatorHelper
    */
   public static TypeCode type()
   {
-    return ORB.init().create_interface_tc(id(), "ServantLocator");
+    return OrbRestricted.Singleton.create_interface_tc(id(), "ServantLocator");
   }
 
   /**
author	Audrius Meskauskas <audriusa@Bioinformatics.org>	2006-07-10 08:24:45 +0000
committer	Audrius Meskauskas <audriusa@Bioinformatics.org>	2006-07-10 08:24:45 +0000
commit	69bc0cc80cc62a9c38f3e78efa1e73074699ed1b (patch)
tree	e6b9e1bfde89ef6e8cbdb29b74b8d0a4fd5f9a73 /org
parent	c45340c2ccf6c1f9c4ca96bcfdbeabcfd652e2a6 (diff)
download	classpath-69bc0cc80cc62a9c38f3e78efa1e73074699ed1b.tar.gz