1 files changed, 5 insertions, 14 deletions
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)