1 files changed, 3 insertions, 14 deletions
diff --git a/libjava/classpath/org/omg/CosNaming/NamingContextPackage/InvalidNameHelper.java b/libjava/classpath/org/omg/CosNaming/NamingContextPackage/InvalidNameHelper.java
index 8f1133602d7..5893332b804 100644
--- a/libjava/classpath/org/omg/CosNaming/NamingContextPackage/InvalidNameHelper.java
+++ b/libjava/classpath/org/omg/CosNaming/NamingContextPackage/InvalidNameHelper.java
@@ -39,6 +39,7 @@ exception statement from your version. */
 package org.omg.CosNaming.NamingContextPackage;
 
 import gnu.CORBA.Minor;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
@@ -62,11 +63,6 @@ public abstract class InvalidNameHelper
     "IDL:omg.org/CosNaming/NamingContext/InvalidName:1.0";
 
   /**
-   * The cached type code value.
-   */
-  private static TypeCode typeCode;
-
-  /**
    * Extract the exception from the given {@link Any}.
    */
   public static InvalidName extract(Any a)
@@ -117,15 +113,8 @@ public abstract class InvalidNameHelper
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      {
-        if (typeCode == null)
-          typeCode =
-            ORB.init().create_struct_tc(id(), "InvalidName",
-                                        new StructMember[ 0 ]
-                                       );
-      }
-    return typeCode;
+    return OrbRestricted.Singleton.create_struct_tc(id(), 
+      "InvalidName", new StructMember[0]);
   }
 
   /**