2006-08-14 Mark Wielaard <mark@klomp.org>

       Imported GNU Classpath 0.92
       * HACKING: Add more importing hints. Update automake version
       requirement.

       * configure.ac (gconf-peer): New enable AC argument.
       Add --disable-gconf-peer and --enable-default-preferences-peer
       to classpath configure when gconf is disabled.
       * scripts/makemake.tcl: Set gnu/java/util/prefs/gconf and
       gnu/java/awt/dnd/peer/gtk to bc. Classify
       gnu/java/security/Configuration.java as generated source file.

       * gnu/java/lang/management/VMGarbageCollectorMXBeanImpl.java,
       gnu/java/lang/management/VMMemoryPoolMXBeanImpl.java,
       gnu/java/lang/management/VMClassLoadingMXBeanImpl.java,
       gnu/java/lang/management/VMRuntimeMXBeanImpl.java,
       gnu/java/lang/management/VMMemoryManagerMXBeanImpl.java,
       gnu/java/lang/management/VMThreadMXBeanImpl.java,
       gnu/java/lang/management/VMMemoryMXBeanImpl.java,
       gnu/java/lang/management/VMCompilationMXBeanImpl.java: New VM stub
       classes.
       * java/lang/management/VMManagementFactory.java: Likewise.
       * java/net/VMURLConnection.java: Likewise.
       * gnu/java/nio/VMChannel.java: Likewise.

       * java/lang/Thread.java (getState): Add stub implementation.
       * java/lang/Class.java (isEnum): Likewise.
       * java/lang/Class.h (isEnum): Likewise.

       * gnu/awt/xlib/XToolkit.java (getClasspathTextLayoutPeer): Removed.

       * javax/naming/spi/NamingManager.java: New override for StackWalker
       functionality.

       * configure, sources.am, Makefile.in, gcj/Makefile.in,
       include/Makefile.in, testsuite/Makefile.in: Regenerated.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@116139 138bc75d-0d04-0410-961f-82ee72b054a4

21 files changed, 129 insertions, 268 deletions

diff --git a/libjava/classpath/org/omg/CORBA/CompletionStatusHelper.java b/libjava/classpath/org/omg/CORBA/CompletionStatusHelper.java
index 43b6b8c1099..bf1c375324d 100644
--- a/libjava/classpath/org/omg/CORBA/CompletionStatusHelper.java
+++ b/libjava/classpath/org/omg/CORBA/CompletionStatusHelper.java
@@ -52,11 +52,6 @@ import org.omg.CORBA.portable.OutputStream;
 public abstract class CompletionStatusHelper
 {
   /**
-   * The cached typecode value, computed once.
-   */
-  private static TypeCode typeCode;
-
-  /**
    * Extract the {@link CompletionStatus} from the
    * given {@link Any}. This implementation expects
    * the integer (Corba long) value, stating the completion
@@ -125,16 +120,12 @@ public abstract class CompletionStatusHelper
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      {
-        String[] members =
-          new String[] { "COMPLETED_YES", "COMPLETED_NO", "COMPLETED_MAYBE" };
-
-        typeCode =
-          OrbRestricted.Singleton.create_enum_tc(id(), "CompletionStatus",
-                                                  members
-                                                 );
-      }
-    return typeCode;
+    String[] members =
+      new String[] { "COMPLETED_YES", "COMPLETED_NO", "COMPLETED_MAYBE" };
+    
+    return
+      OrbRestricted.Singleton.create_enum_tc(id(), "CompletionStatus",
+                                             members
+      );
   }
 }
\ No newline at end of file
diff --git a/libjava/classpath/org/omg/CORBA/CurrentHelper.java b/libjava/classpath/org/omg/CORBA/CurrentHelper.java
index 51bd65fc143..f292449ecd1 100644
--- a/libjava/classpath/org/omg/CORBA/CurrentHelper.java
+++ b/libjava/classpath/org/omg/CORBA/CurrentHelper.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package org.omg.CORBA;
 
+import gnu.CORBA.OrbRestricted;
+
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
 import org.omg.CORBA.ORB;
@@ -85,18 +87,12 @@ public abstract class CurrentHelper
   }
 
   /**
-   * The cached {@link Current} typecode, computed once.
-   */
-  private static TypeCode typeCode;
-
-  /**
    * Get the type code of the {@link Current}.
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      typeCode = ORB.init().create_interface_tc(id(), "Current");
-    return typeCode;
+    return
+      OrbRestricted.Singleton.create_interface_tc(id(), "Current");
   }
 
   /**
diff --git a/libjava/classpath/org/omg/CORBA/DefinitionKindHelper.java b/libjava/classpath/org/omg/CORBA/DefinitionKindHelper.java
index fddbb585a2e..ef7e26725b3 100644
--- a/libjava/classpath/org/omg/CORBA/DefinitionKindHelper.java
+++ b/libjava/classpath/org/omg/CORBA/DefinitionKindHelper.java
@@ -55,11 +55,6 @@ import org.omg.CORBA.portable.OutputStream;
 public abstract class DefinitionKindHelper
 {
   /**
-   * The cached typecode value, computed only once.
-   */
-  private static TypeCode typeCode;
-
-  /**
    * Insert the definition kind into the given Any.
    */
   public static void insert(Any a, DefinitionKind that)
@@ -83,25 +78,21 @@ public abstract class DefinitionKindHelper
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      {
-        String[] members =
-          new String[]
-          {
-            "dk_none", "dk_all", "dk_Attribute", "dk_Constant", "dk_Exception",
-            "dk_Interface", "dk_Module", "dk_Operation", "dk_Typedef",
-            "dk_Alias", "dk_Struct", "dk_Union", "dk_Enum", "dk_Primitive",
-            "dk_String", "dk_Sequence", "dk_Array", "dk_Repository",
-            "dk_Wstring", "dk_Fixed", "dk_Value", "dk_ValueBox",
-            "dk_ValueMember", "dk_Native"
-          };
-
-        typeCode =
-          OrbRestricted.Singleton.create_enum_tc(id(), "DefinitionKind",
-                                                  members
-                                                 );
-      }
-    return typeCode;
+    String[] members =
+      new String[]
+                 {
+                  "dk_none", "dk_all", "dk_Attribute", "dk_Constant", "dk_Exception",
+                  "dk_Interface", "dk_Module", "dk_Operation", "dk_Typedef",
+                  "dk_Alias", "dk_Struct", "dk_Union", "dk_Enum", "dk_Primitive",
+                  "dk_String", "dk_Sequence", "dk_Array", "dk_Repository",
+                  "dk_Wstring", "dk_Fixed", "dk_Value", "dk_ValueBox",
+                  "dk_ValueMember", "dk_Native"
+                 };
+    
+    return
+    OrbRestricted.Singleton.create_enum_tc(id(), "DefinitionKind",
+                                           members
+    );
   }
 
   /**
diff --git a/libjava/classpath/org/omg/CORBA/IDLTypeHelper.java b/libjava/classpath/org/omg/CORBA/IDLTypeHelper.java
index 635168eb82d..ff874947f5e 100644
--- a/libjava/classpath/org/omg/CORBA/IDLTypeHelper.java
+++ b/libjava/classpath/org/omg/CORBA/IDLTypeHelper.java
@@ -53,11 +53,6 @@ import org.omg.CORBA.portable.OutputStream;
 public abstract class IDLTypeHelper
 {
   /**
-   * The cached typecode value, computed once.
-   */
-  private static TypeCode typeCode;
-
-  /**
    * Insert the IDL type into the given Any.
    */
   public static void insert(Any a, IDLType that)
@@ -81,14 +76,8 @@ public abstract class IDLTypeHelper
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      {
-        typeCode =
-          OrbRestricted.Singleton.create_interface_tc(IDLTypeHelper.id(),
-                                                       "IDLType"
-                                                      );
-      }
-    return typeCode;
+    return OrbRestricted.Singleton.create_interface_tc(IDLTypeHelper.id(),
+                                                       "IDLType");
   }
 
   /**
diff --git a/libjava/classpath/org/omg/CORBA/NameValuePairHelper.java b/libjava/classpath/org/omg/CORBA/NameValuePairHelper.java
index 5d2430b23bb..f6d93393038 100644
--- a/libjava/classpath/org/omg/CORBA/NameValuePairHelper.java
+++ b/libjava/classpath/org/omg/CORBA/NameValuePairHelper.java
@@ -43,6 +43,7 @@ import gnu.CORBA.typecodes.AliasTypeCode;
 import gnu.CORBA.typecodes.PrimitiveTypeCode;
 import gnu.CORBA.typecodes.StringTypeCode;
 import gnu.CORBA.Minor;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
@@ -61,11 +62,6 @@ public abstract class NameValuePairHelper
   private static String _id = "IDL:omg.org/CORBA/NameValuePair:1.0";
 
   /**
-   * The cached type code value.
-   */
-  private static TypeCode typeCode;
-
-  /**
    * Extract the NameValuePair from the given {@link Any}.
    */
   public static NameValuePair extract(Any a)
@@ -115,21 +111,18 @@ public abstract class NameValuePairHelper
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      {
-        StructMember[] members = new StructMember[ 2 ];
+    StructMember[] members = new StructMember[2];
 
-        TypeCode t_id =
-          new AliasTypeCode(new StringTypeCode(TCKind.tk_string), "", "id");
+    TypeCode t_id = new AliasTypeCode(new StringTypeCode(TCKind.tk_string), "",
+                                      "id");
 
-        members [ 0 ] = new StructMember("id", t_id, null);
+    members[0] = new StructMember("id", t_id, null);
 
-        members [ 1 ] =
-          new StructMember("value", new PrimitiveTypeCode(TCKind.tk_any), null);
+    members[1] = new StructMember("value",
+                                  new PrimitiveTypeCode(TCKind.tk_any), null);
 
-        typeCode = ORB.init().create_struct_tc(id(), "NameValuePair", members);
-      }
-    return typeCode;
+    return OrbRestricted.Singleton.create_struct_tc(id(), "NameValuePair",
+                                                    members);
   }
 
   /**
diff --git a/libjava/classpath/org/omg/CORBA/ObjectHelper.java b/libjava/classpath/org/omg/CORBA/ObjectHelper.java
index 220f2daced2..f662a78880c 100644
--- a/libjava/classpath/org/omg/CORBA/ObjectHelper.java
+++ b/libjava/classpath/org/omg/CORBA/ObjectHelper.java
@@ -39,6 +39,7 @@ exception statement from your version. */
 package org.omg.CORBA;
 
 import gnu.CORBA.Minor;
+import gnu.CORBA.OrbRestricted;
 import gnu.CORBA.typecodes.PrimitiveTypeCode;
 
 import org.omg.CORBA.portable.InputStream;
@@ -51,8 +52,6 @@ import org.omg.CORBA.portable.OutputStream;
  */
 public abstract class ObjectHelper
 {
-  static TypeCode typeCode;
-
   /**
    * Extract the array of object from the given {@link Any}.
    */
@@ -100,9 +99,7 @@ public abstract class ObjectHelper
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      typeCode = ORB.init().get_primitive_tc(TCKind.tk_objref);
-    return typeCode;
+    return OrbRestricted.Singleton.get_primitive_tc(TCKind.tk_objref);
   }
 
   /**
diff --git a/libjava/classpath/org/omg/CORBA/ParameterModeHelper.java b/libjava/classpath/org/omg/CORBA/ParameterModeHelper.java
index ac17a9235ba..c96ce94ac21 100644
--- a/libjava/classpath/org/omg/CORBA/ParameterModeHelper.java
+++ b/libjava/classpath/org/omg/CORBA/ParameterModeHelper.java
@@ -54,11 +54,6 @@ import org.omg.CORBA.portable.OutputStream;
 public abstract class ParameterModeHelper
 {
   /**
-   * The cached typecode value, computed only once.
-   */
-  private static TypeCode typeCode;
-
-  /**
    * Insert the parameter mode into the given Any.
    */
   public static void insert(Any any, ParameterMode that)
@@ -81,15 +76,11 @@ public abstract class ParameterModeHelper
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      {
         String[] members =
           new String[] { "PARAM_IN", "PARAM_OUT", "PARAM_INOUT" };
 
-        typeCode =
+        return
           OrbRestricted.Singleton.create_enum_tc(id(), "ParameterMode", members);
-      }
-    return typeCode;
   }
 
   /**
diff --git a/libjava/classpath/org/omg/CORBA/PolicyErrorCodeHelper.java b/libjava/classpath/org/omg/CORBA/PolicyErrorCodeHelper.java
index ab7ac95479a..6feabdcfdb9 100644
--- a/libjava/classpath/org/omg/CORBA/PolicyErrorCodeHelper.java
+++ b/libjava/classpath/org/omg/CORBA/PolicyErrorCodeHelper.java
@@ -106,7 +106,7 @@ public abstract class PolicyErrorCodeHelper
   }
 
   /**
-   * Delegates call to {@link OutputStream.write_short()}.
+   * Delegates call to {@link OutputStream#write_short()}.
    */
   public static void write(OutputStream ostream, short value)
   {
diff --git a/libjava/classpath/org/omg/CORBA/PolicyErrorHelper.java b/libjava/classpath/org/omg/CORBA/PolicyErrorHelper.java
index 49db768cd3b..27b5b465e53 100644
--- a/libjava/classpath/org/omg/CORBA/PolicyErrorHelper.java
+++ b/libjava/classpath/org/omg/CORBA/PolicyErrorHelper.java
@@ -39,6 +39,7 @@ exception statement from your version. */
 package org.omg.CORBA;
 
 import gnu.CORBA.Minor;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
@@ -57,32 +58,23 @@ import org.omg.CORBA.portable.OutputStream;
 public abstract class PolicyErrorHelper
 {
   /**
-   * The cached typecode value, computed only once.
-   */
-  private static TypeCode typeCode;
-
-  /**
    * Create the PolicyError typecode. The typecode defines a structure, named
    * "PolicyError", containing the {@link PolicyErrorCode} (alias int) field,
    * named "reason".
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      {
-        ORB orb = ORB.init();
-        StructMember[] members = new StructMember[ 1 ];
-
-        TypeCode field;
-
-        field =
-          orb.create_alias_tc("IDL:omg.org/CORBA/PolicyErrorCode:1.0",
-            "PolicyErrorCode", orb.get_primitive_tc(TCKind.tk_short)
-          );
-        members [ 0 ] = new StructMember("reason", field, null);
-        typeCode = orb.create_exception_tc(id(), "PolicyError", members);
-      }
-    return typeCode;
+    ORB orb = OrbRestricted.Singleton;
+    StructMember[] members = new StructMember[ 1 ];
+    
+    TypeCode field;
+    
+    field =
+      orb.create_alias_tc("IDL:omg.org/CORBA/PolicyErrorCode:1.0",
+                          "PolicyErrorCode", orb.get_primitive_tc(TCKind.tk_short)
+      );
+    members [ 0 ] = new StructMember("reason", field, null);
+    return orb.create_exception_tc(id(), "PolicyError", members);
   }
 
   /**
diff --git a/libjava/classpath/org/omg/CORBA/PolicyHelper.java b/libjava/classpath/org/omg/CORBA/PolicyHelper.java
index 66fb0aa0868..53b56244eb2 100644
--- a/libjava/classpath/org/omg/CORBA/PolicyHelper.java
+++ b/libjava/classpath/org/omg/CORBA/PolicyHelper.java
@@ -39,6 +39,7 @@ exception statement from your version. */
 package org.omg.CORBA;
 
 import gnu.CORBA.Minor;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
@@ -60,20 +61,13 @@ import org.omg.CORBA.portable.OutputStream;
 public abstract class PolicyHelper
 {
   /**
-   * The cached {@link Policy} typecode, computed once.
-   */
-  private static TypeCode typeCode;
-
-  /**
    * Get the type code of the {@link Policy}.
    *
    * @return interface typecode, named "Policy".
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      typeCode = ORB.init().create_interface_tc(id(), "Policy");
-    return typeCode;
+    return OrbRestricted.Singleton.create_interface_tc(id(), "Policy");
   }
 
   /**
diff --git a/libjava/classpath/org/omg/CORBA/PolicyListHelper.java b/libjava/classpath/org/omg/CORBA/PolicyListHelper.java
index 6e4d329b837..da0135c0222 100644
--- a/libjava/classpath/org/omg/CORBA/PolicyListHelper.java
+++ b/libjava/classpath/org/omg/CORBA/PolicyListHelper.java
@@ -39,6 +39,7 @@ exception statement from your version. */
 package org.omg.CORBA;
 
 import gnu.CORBA.Minor;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
@@ -60,18 +61,11 @@ import org.omg.CORBA.portable.OutputStream;
 public abstract class PolicyListHelper
 {
   /**
-   * The cached {@link Policy[]} typecode, computed once.
-   */
-  private static TypeCode typeCode;
-
-  /**
    * Get the type code of the {@link Policy[]}.
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      typeCode = ORB.init().create_interface_tc(id(), "Policy[]");
-    return typeCode;
+     return OrbRestricted.Singleton.create_interface_tc(id(), "Policy[]");
   }
 
   /**
diff --git a/libjava/classpath/org/omg/CORBA/PolicyTypeHelper.java b/libjava/classpath/org/omg/CORBA/PolicyTypeHelper.java
index dadd3a9e6ef..7d5f9bf7656 100644
--- a/libjava/classpath/org/omg/CORBA/PolicyTypeHelper.java
+++ b/libjava/classpath/org/omg/CORBA/PolicyTypeHelper.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package org.omg.CORBA;
 
+import gnu.CORBA.OrbRestricted;
+
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
 import org.omg.CORBA.ORB;
@@ -65,7 +67,7 @@ public abstract class PolicyTypeHelper
    */
   public static TypeCode type()
   {
-    ORB orb = ORB.init();
+    ORB orb = OrbRestricted.Singleton;
     return orb.create_alias_tc(id(), "PolicyType",
                                orb.get_primitive_tc(TCKind.tk_ulong)
                               );
diff --git a/libjava/classpath/org/omg/CORBA/ServiceDetailHelper.java b/libjava/classpath/org/omg/CORBA/ServiceDetailHelper.java
index 58000f2c5c7..76fbda610e6 100644
--- a/libjava/classpath/org/omg/CORBA/ServiceDetailHelper.java
+++ b/libjava/classpath/org/omg/CORBA/ServiceDetailHelper.java
@@ -39,6 +39,7 @@ exception statement from your version. */
 package org.omg.CORBA;
 
 import gnu.CORBA.Minor;
+import gnu.CORBA.OrbRestricted;
 import gnu.CORBA.ServiceDetailHolder;
 
 import org.omg.CORBA.portable.InputStream;
@@ -57,11 +58,6 @@ public abstract class ServiceDetailHelper
   private static String _id = "IDL:omg.org/CORBA/ServiceDetail:1.0";
 
   /**
-   * The cached typecode value, computed once.
-   */
-  private static TypeCode typeCode;
-
-  /**
    * Extract the service detail info from the given {@link Any}
    *
    * @param a the Any to extract from.
@@ -137,25 +133,21 @@ public abstract class ServiceDetailHelper
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      {
-        ORB orb = ORB.init();
-
-        StructMember[] members = new StructMember[ 2 ];
-
-        TypeCode type =
-          orb.create_alias_tc(_id, "ServiceDetailType",
-            orb.get_primitive_tc(TCKind.tk_ulong)
-          );
-        members [ 0 ] = new StructMember("service_detail_type", type, null);
-
-        TypeCode data =
-          orb.create_sequence_tc(0, orb.get_primitive_tc(TCKind.tk_octet));
-        members [ 1 ] = new StructMember("service_detail", data, null);
-
-        typeCode = orb.create_struct_tc(id(), "ServiceDetail", members);
-      }
-    return typeCode;
+    ORB orb = OrbRestricted.Singleton;
+    
+    StructMember[] members = new StructMember[ 2 ];
+    
+    TypeCode type =
+      orb.create_alias_tc(_id, "ServiceDetailType",
+                          orb.get_primitive_tc(TCKind.tk_ulong)
+      );
+    members [ 0 ] = new StructMember("service_detail_type", type, null);
+    
+    TypeCode data =
+      orb.create_sequence_tc(0, orb.get_primitive_tc(TCKind.tk_octet));
+    members [ 1 ] = new StructMember("service_detail", data, null);
+    
+    return orb.create_struct_tc(id(), "ServiceDetail", members);
   }
 
   /**
diff --git a/libjava/classpath/org/omg/CORBA/ServiceInformationHelper.java b/libjava/classpath/org/omg/CORBA/ServiceInformationHelper.java
index 78a21d1826f..f77378fd79c 100644
--- a/libjava/classpath/org/omg/CORBA/ServiceInformationHelper.java
+++ b/libjava/classpath/org/omg/CORBA/ServiceInformationHelper.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package org.omg.CORBA;
 
+import gnu.CORBA.OrbRestricted;
+
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
 
@@ -57,11 +59,6 @@ public abstract class ServiceInformationHelper
   private static String _id = "IDL:org/omg/CORBA/ServiceInformation:1.0";
 
   /**
-   * The caches typecode value, computed once.
-   */
-  private static TypeCode typeCode;
-
-  /**
    * Extract the service information from the given Any.
    */
   public static ServiceInformation extract(Any a)
@@ -109,34 +106,30 @@ public abstract class ServiceInformationHelper
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      {
-        ORB orb = ORB.init();
-
-        StructMember[] members = new StructMember[ 2 ];
-        TypeCode member;
-
-        member =
-          orb.create_alias_tc("IDL:omg.org/CORBA/ServiceOptionSeq:1.0",
-                              "ServiceOptionSeq", LongSeqHelper.type()
-                             );
-
-        members [ 0 ] = new StructMember("service_options", member, null);
-
-        member = ServiceDetailHelper.type();
-        member = orb.create_sequence_tc(0, member);
-        member =
-          orb.create_alias_tc("IDL:omg.org/CORBA/ServiceDetailSeq:1.0",
-                              "ServiceDetailSeq", member
-                             );
-        members [ 1 ] = new StructMember("service_details", member, null);
-
-        typeCode =
-          orb.create_struct_tc(ServiceInformationHelper.id(),
-                               "ServiceInformation", members
-                              );
-      }
-    return typeCode;
+    ORB orb = OrbRestricted.Singleton;
+    
+    StructMember[] members = new StructMember[ 2 ];
+    TypeCode member;
+    
+    member =
+      orb.create_alias_tc("IDL:omg.org/CORBA/ServiceOptionSeq:1.0",
+                          "ServiceOptionSeq", LongSeqHelper.type()
+      );
+    
+    members [ 0 ] = new StructMember("service_options", member, null);
+    
+    member = ServiceDetailHelper.type();
+    member = orb.create_sequence_tc(0, member);
+    member =
+      orb.create_alias_tc("IDL:omg.org/CORBA/ServiceDetailSeq:1.0",
+                          "ServiceDetailSeq", member
+      );
+    members [ 1 ] = new StructMember("service_details", member, null);
+    
+    return
+    orb.create_struct_tc(ServiceInformationHelper.id(),
+                         "ServiceInformation", members
+    );
   }
 
   /**
diff --git a/libjava/classpath/org/omg/CORBA/SetOverrideTypeHelper.java b/libjava/classpath/org/omg/CORBA/SetOverrideTypeHelper.java
index 1fa1ef868d1..fb2c8235a91 100644
--- a/libjava/classpath/org/omg/CORBA/SetOverrideTypeHelper.java
+++ b/libjava/classpath/org/omg/CORBA/SetOverrideTypeHelper.java
@@ -52,11 +52,6 @@ import org.omg.CORBA.portable.OutputStream;
 public abstract class SetOverrideTypeHelper
 {
   /**
-   * The cached typecode value, computed only once.
-   */
-  private static TypeCode typeCode;
-
-  /**
    * Insert the definition kind into the given Any.
    */
   public static void insert(Any any, SetOverrideType that)
@@ -79,20 +74,16 @@ public abstract class SetOverrideTypeHelper
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      {
-        String[] members =
-          new String[]
-          {
-            "SET_OVERRIDE" ,"ADD_OVERRIDE" 
-          };
-
-        typeCode =
-          OrbRestricted.Singleton.create_enum_tc(id(), "SetOverrideType",
-                                                  members
-                                                 );
-      }
-    return typeCode;
+    String[] members =
+      new String[]
+                 {
+                  "SET_OVERRIDE" ,"ADD_OVERRIDE" 
+                 };
+    
+    return
+    OrbRestricted.Singleton.create_enum_tc(id(), "SetOverrideType",
+                                           members
+    );
   }
 
   /**
diff --git a/libjava/classpath/org/omg/CORBA/StringValueHelper.java b/libjava/classpath/org/omg/CORBA/StringValueHelper.java
index 24e79ce571b..5273f5cfb9d 100644
--- a/libjava/classpath/org/omg/CORBA/StringValueHelper.java
+++ b/libjava/classpath/org/omg/CORBA/StringValueHelper.java
@@ -66,11 +66,6 @@ public class StringValueHelper
   private static final String id = "IDL:omg.org/CORBA/StringValue:1.0";
 
   /**
-   * The cached typecode value, computed once.
-   */
-  private static TypeCode typecode;
-
-  /**
    * The String typecode.
    */
   private static final TypeCode tString =
@@ -175,18 +170,13 @@ public class StringValueHelper
   }
 
   /**
-   * Create and return the value box typecode, named "StringValue",
-   * with the content typecode being unbounded string.
+   * Create and return the value box typecode, named "StringValue", with the
+   * content typecode being unbounded string.
    */
   public static TypeCode type()
   {
-    if (typecode == null)
-      {
-        ORB orb = OrbRestricted.Singleton;
-        typecode =
-          orb.create_value_box_tc(id(), "StringValue", tString);
-      }
-    return typecode;
+    ORB orb = OrbRestricted.Singleton;
+    return orb.create_value_box_tc(id(), "StringValue", tString);
   }
 
   /**
diff --git a/libjava/classpath/org/omg/CORBA/UnionMemberHelper.java b/libjava/classpath/org/omg/CORBA/UnionMemberHelper.java
index c599542fb96..ef69329b7ab 100644
--- a/libjava/classpath/org/omg/CORBA/UnionMemberHelper.java
+++ b/libjava/classpath/org/omg/CORBA/UnionMemberHelper.java
@@ -94,7 +94,7 @@ public abstract class UnionMemberHelper
               {
                 if (active)
                   {
-                    return ORB.init().create_recursive_tc(id());
+                    return OrbRestricted.Singleton.create_recursive_tc(id());
                   }
                 active = true;
 
diff --git a/libjava/classpath/org/omg/CORBA/UnknownUserExceptionHelper.java b/libjava/classpath/org/omg/CORBA/UnknownUserExceptionHelper.java
index e93dc740399..0ca50cb88c2 100644
--- a/libjava/classpath/org/omg/CORBA/UnknownUserExceptionHelper.java
+++ b/libjava/classpath/org/omg/CORBA/UnknownUserExceptionHelper.java
@@ -39,6 +39,7 @@ exception statement from your version. */
 package org.omg.CORBA;
 
 import gnu.CORBA.Minor;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
@@ -57,30 +58,21 @@ import org.omg.CORBA.portable.OutputStream;
 public abstract class UnknownUserExceptionHelper
 {
   /**
-   * The cached typecode value, computed only once.
-   */
-  private static TypeCode typeCode;
-
-  /**
    * Create the UnknownUserException typecode (structure,
    * named "UnknownUserException", containing a single field of
    * type {@link Any}, named "except".
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      {
-        ORB orb = ORB.init();
+        ORB orb = OrbRestricted.Singleton;
         StructMember[] members = new StructMember[ 1 ];
 
         TypeCode field;
 
         field = orb.get_primitive_tc(TCKind.tk_any);
         members [ 0 ] = new StructMember("except", field, null);
-        typeCode =
+        return
           orb.create_exception_tc(id(), "UnknownUserException", members);
-      }
-    return typeCode;
   }
 
   /**
diff --git a/libjava/classpath/org/omg/CORBA/VisibilityHelper.java b/libjava/classpath/org/omg/CORBA/VisibilityHelper.java
index a09e5b6867d..a00f96e140e 100644
--- a/libjava/classpath/org/omg/CORBA/VisibilityHelper.java
+++ b/libjava/classpath/org/omg/CORBA/VisibilityHelper.java
@@ -53,11 +53,6 @@ import org.omg.CORBA.portable.OutputStream;
 public abstract class VisibilityHelper
 {
   /**
-   * The cached typecode value, computed only once.
-   */
-  private static TypeCode typeCode;
-
-  /**
    * Insert the Visibility into the given Any.
    * Uses {@link Any#insert_short}.
    */
@@ -80,14 +75,10 @@ public abstract class VisibilityHelper
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      {
         TypeCode tshort =
           OrbRestricted.Singleton.get_primitive_tc(TCKind.tk_short);
-        typeCode =
+        return
           OrbRestricted.Singleton.create_alias_tc(id(), "Visibility", tshort);
-      }
-    return typeCode;
   }
 
   /**
diff --git a/libjava/classpath/org/omg/CORBA/WStringValueHelper.java b/libjava/classpath/org/omg/CORBA/WStringValueHelper.java
index 1c63a408e3d..17f23214cf6 100644
--- a/libjava/classpath/org/omg/CORBA/WStringValueHelper.java
+++ b/libjava/classpath/org/omg/CORBA/WStringValueHelper.java
@@ -66,11 +66,6 @@ public class WStringValueHelper
   private static final String id = "IDL:omg.org/CORBA/WStringValue:1.0";
 
   /**
-   * The cached typecode value, computed once.
-   */
-  private static TypeCode typecode;
-
-  /**
    * The Wide String typecode.
    */
   private static final TypeCode twString =
@@ -175,18 +170,13 @@ public class WStringValueHelper
   }
 
   /**
-   * Create and return the value box typecode, named "WStringValue",
-   * with the content typecode being unbounded string.
+   * Create and return the value box typecode, named "WStringValue", with the
+   * content typecode being unbounded string.
    */
   public static TypeCode type()
   {
-    if (typecode == null)
-      {
-        ORB orb = OrbRestricted.Singleton;
-        typecode =
-          orb.create_value_box_tc(id(), "WStringValue", twString);
-      }
-    return typecode;
+    ORB orb = OrbRestricted.Singleton;
+    return orb.create_value_box_tc(id(), "WStringValue", twString);
   }
 
   /**
diff --git a/libjava/classpath/org/omg/CORBA/WrongTransactionHelper.java b/libjava/classpath/org/omg/CORBA/WrongTransactionHelper.java
index 5bb5baff2eb..27368a4c03a 100644
--- a/libjava/classpath/org/omg/CORBA/WrongTransactionHelper.java
+++ b/libjava/classpath/org/omg/CORBA/WrongTransactionHelper.java
@@ -40,6 +40,7 @@ package org.omg.CORBA;
 
 import gnu.CORBA.EmptyExceptionHolder;
 import gnu.CORBA.Minor;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
@@ -58,23 +59,14 @@ import org.omg.CORBA.portable.OutputStream;
 public abstract class WrongTransactionHelper
 {
   /**
-   * The cached typecode value, computed only once.
-   */
-  private static TypeCode typeCode;
-
-  /**
    * Create the WrongTransaction typecode (structure,
    * named "WrongTransaction"), no fields.
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      {
-        ORB orb = ORB.init();
-        StructMember[] members = new StructMember[ 0 ];
-        typeCode = orb.create_exception_tc(id(), "WrongTransaction", members);
-      }
-    return typeCode;
+    ORB orb = OrbRestricted.Singleton;
+    StructMember[] members = new StructMember[ 0 ];
+    return orb.create_exception_tc(id(), "WrongTransaction", members);
   }
 
   /* Every user exception with no user defined