diff options
Diffstat (limited to 'libjava/classpath/org/omg/CosNaming/NameHelper.java')
| -rw-r--r-- | libjava/classpath/org/omg/CosNaming/NameHelper.java | 18 |
1 files changed, 6 insertions, 12 deletions
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; @@ -62,11 +63,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}. */ public static NameComponent[] extract(Any a) @@ -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; } |
