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

1 files changed, 7 insertions, 12 deletions

diff --git a/libjava/classpath/org/omg/CosNaming/BindingListHelper.java b/libjava/classpath/org/omg/CosNaming/BindingListHelper.java
index 44fe39dcad2..de04989e0b4 100644
--- a/libjava/classpath/org/omg/CosNaming/BindingListHelper.java
+++ b/libjava/classpath/org/omg/CosNaming/BindingListHelper.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package org.omg.CosNaming;
 
+import gnu.CORBA.OrbRestricted;
+
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
 import org.omg.CORBA.ORB;
@@ -58,11 +60,6 @@ public abstract class BindingListHelper
   private static String _id = "IDL:omg.org/CosNaming/BindingList:1.0";
 
   /**
-   * The cached binding list type code.
-   */
-  private static TypeCode typeCode;
-
-  /**
    * Extract the array of bindings from the given {@link Any}.
    */
   public static Binding[] extract(Any a)
@@ -112,13 +109,11 @@ public abstract class BindingListHelper
    */
   public static TypeCode type()
   {
-    if (typeCode == null)
-      {
-        ORB orb = ORB.init();
-        typeCode = BindingHelper.type();
-        typeCode = orb.create_sequence_tc(0, typeCode);
-        typeCode = orb.create_alias_tc(id(), "BindingList", typeCode);
-      }
+    TypeCode typeCode;
+    ORB orb = OrbRestricted.Singleton;
+    typeCode = BindingHelper.type();
+    typeCode = orb.create_sequence_tc(0, typeCode);
+    typeCode = orb.create_alias_tc(id(), "BindingList", typeCode);
     return typeCode;
   }