1 files changed, 3 insertions, 9 deletions
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 ]);
   }
 
   /**