1 files changed, 16 insertions, 24 deletions
diff --git a/libjava/classpath/org/omg/DynamicAny/NameValuePairHelper.java b/libjava/classpath/org/omg/DynamicAny/NameValuePairHelper.java
index 1e0f52b5946..75bbf9a7433 100644
--- a/libjava/classpath/org/omg/DynamicAny/NameValuePairHelper.java
+++ b/libjava/classpath/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);
   }
 
   /**