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

2 files changed, 17 insertions, 37 deletions

diff --git a/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateNameHelper.java b/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateNameHelper.java
index 648e9679b42..2d9740a855e 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateNameHelper.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateNameHelper.java
@@ -57,36 +57,25 @@ import org.omg.CORBA.portable.OutputStream;
 public abstract class DuplicateNameHelper
 {
   /**
-   * The cached typecode value, computed only once.
-   */
-  private static TypeCode typeCode;
-
-  /**
-   * Create the DuplicateName typecode (structure,
-   * named "DuplicateName").
-   * The typecode states that the structure contains the
-   * following fields: name.
+   * Create the DuplicateName typecode (structure, named "DuplicateName"). The
+   * typecode states that the structure contains the following fields: name.
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      {
-        ORB orb = ORB.init();
-        StructMember[] members = new StructMember[ 1 ];
+    ORB orb = OrbRestricted.Singleton;
+    StructMember[] members = new StructMember[1];
 
-        TypeCode field;
+    TypeCode field;
 
-        field = orb.get_primitive_tc(TCKind.tk_string);
-        members [ 0 ] = new StructMember("name", field, null);
-        typeCode = orb.create_exception_tc(id(), "DuplicateName", members);
-      }
-    return typeCode;
+    field = orb.get_primitive_tc(TCKind.tk_string);
+    members[0] = new StructMember("name", field, null);
+    return orb.create_exception_tc(id(), "DuplicateName", members);
   }
 
   /**
-   * Insert the DuplicateName into the given Any.
-   * This method uses the DuplicateNameHolder.
-   *
+   * Insert the DuplicateName into the given Any. This method uses the
+   * DuplicateNameHolder.
+   * 
    * @param any the Any to insert into.
    * @param that the DuplicateName to insert.
    */
diff --git a/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidNameHelper.java b/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidNameHelper.java
index f89f9d4c6db..a87a3b747fd 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidNameHelper.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidNameHelper.java
@@ -40,6 +40,7 @@ package org.omg.PortableInterceptor.ORBInitInfoPackage;
 
 import gnu.CORBA.EmptyExceptionHolder;
 import gnu.CORBA.Minor;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
@@ -58,28 +59,18 @@ import org.omg.CORBA.portable.OutputStream;
 public abstract class InvalidNameHelper
 {
   /**
-   * The cached typecode value, computed only once.
-   */
-  private static TypeCode typeCode;
-
-  /**
-   * Create the InvalidName typecode (structure,
-   * named "InvalidName").
+   * Create the InvalidName typecode (structure, named "InvalidName").
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      {
-        ORB orb = ORB.init();
-        StructMember[] members = new StructMember[ 0 ];
-        typeCode = orb.create_exception_tc(id(), "InvalidName", members);
-      }
-    return typeCode;
+    ORB orb = OrbRestricted.Singleton;
+    StructMember[] members = new StructMember[0];
+    return orb.create_exception_tc(id(), "InvalidName", members);
   }
 
   /**
    * Insert the InvalidName into the given Any.
-   *
+   * 
    * @param any the Any to insert into.
    * @param that the InvalidName to insert.
    */