1 files changed, 12 insertions, 20 deletions

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);
   }
 
   /**