From ffde862e033a0825e1e9972a89c0f1f80b261a8e Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 14 Aug 2006 23:12:35 +0000 Subject: 2006-08-14 Mark Wielaard 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 --- libjava/classpath/org/omg/CosNaming/NameHelper.java | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'libjava/classpath/org/omg/CosNaming/NameHelper.java') diff --git a/libjava/classpath/org/omg/CosNaming/NameHelper.java b/libjava/classpath/org/omg/CosNaming/NameHelper.java index 18faf31823b..f66fa4f099d 100644 --- a/libjava/classpath/org/omg/CosNaming/NameHelper.java +++ b/libjava/classpath/org/omg/CosNaming/NameHelper.java @@ -39,6 +39,7 @@ exception statement from your version. */ package org.omg.CosNaming; import gnu.CORBA.Minor; +import gnu.CORBA.OrbRestricted; import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; @@ -61,11 +62,6 @@ public abstract class NameHelper */ private static String _id = "IDL:omg.org/CosNaming/Name:1.0"; - /** - * The cached typecode of the Name. - */ - private static TypeCode typeCode; - /** * Extract the Name the given {@link Any}. */ @@ -118,13 +114,11 @@ public abstract class NameHelper */ public static TypeCode type() { - if (typeCode == null) - { - typeCode = NameComponentHelper.type(); - typeCode = ORB.init().create_sequence_tc(0, typeCode); - typeCode = - ORB.init().create_alias_tc(NameHelper.id(), "Name", typeCode); - } + TypeCode typeCode; + typeCode = NameComponentHelper.type(); + typeCode = OrbRestricted.Singleton.create_sequence_tc(0, typeCode); + typeCode = + OrbRestricted.Singleton.create_alias_tc(NameHelper.id(), "Name", typeCode); return typeCode; } -- cgit v1.2.3