2006-07-10 Audrius Meskauskas <AudriusA@Bioinformatics.org>

	* examples/gnu/classpath/examples/CORBA/SimpleCommunication/
	communication/StructureToPassHelper.java,
	examples/gnu/classpath/examples/CORBA/SimpleCommunication/
	communication/StructureToReturnHelper.java,
	examples/gnu/classpath/examples/CORBA/SimpleCommunication/
	communication/TreeNodeHelper.java,
	examples/gnu/classpath/examples/CORBA/SimpleCommunication/
	communication/WeThrowThisExceptionHelper.java,
	gnu/CORBA/ForwardRequestHelper.java,
	org/omg/CORBA/CompletionStatusHelper.java,
	org/omg/CORBA/CurrentHelper.java,
	org/omg/CORBA/DefinitionKindHelper.java,
	org/omg/CORBA/IDLTypeHelper.java,
	org/omg/CORBA/NameValuePairHelper.java,
	org/omg/CORBA/ObjectHelper.java,
	org/omg/CORBA/ParameterModeHelper.java,
	org/omg/CORBA/PolicyErrorCodeHelper.java,
	org/omg/CORBA/PolicyErrorHelper.java,
	org/omg/CORBA/PolicyHelper.java,
	org/omg/CORBA/PolicyListHelper.java,
	org/omg/CORBA/PolicyTypeHelper.java,
	org/omg/CORBA/ServiceDetailHelper.java,
	org/omg/CORBA/ServiceInformationHelper.java,
	org/omg/CORBA/SetOverrideTypeHelper.java,
	org/omg/CORBA/StringValueHelper.java,
	org/omg/CORBA/UnionMemberHelper.java,
	org/omg/CORBA/UnknownUserExceptionHelper.java,
	org/omg/CORBA/VisibilityHelper.java,
	org/omg/CORBA/WStringValueHelper.java,
	org/omg/CORBA/WrongTransactionHelper.java,
	org/omg/CosNaming/BindingHelper.java,
	org/omg/CosNaming/BindingIteratorHelper.java,
	org/omg/CosNaming/BindingListHelper.java,
	org/omg/CosNaming/BindingTypeHelper.java,
	org/omg/CosNaming/NameComponentHelper.java,
	org/omg/CosNaming/NameHelper.java,
	org/omg/CosNaming/NamingContextExtHelper.java,
	org/omg/CosNaming/NamingContextExtPackage/AddressHelper.java,
	org/omg/CosNaming/NamingContextExtPackage/InvalidAddressHelper.java,
	org/omg/CosNaming/NamingContextExtPackage/StringNameHelper.java,
	org/omg/CosNaming/NamingContextExtPackage/URLStringHelper.java,
	org/omg/CosNaming/NamingContextHelper.java,
	org/omg/CosNaming/NamingContextPackage/AlreadyBoundHelper.java,
	org/omg/CosNaming/NamingContextPackage/CannotProceedHelper.java,
	org/omg/CosNaming/NamingContextPackage/InvalidNameHelper.java,
	org/omg/CosNaming/NamingContextPackage/NotEmptyHelper.java,
	org/omg/CosNaming/NamingContextPackage/NotFoundHelper.java,
	org/omg/CosNaming/NamingContextPackage/NotFoundReasonHelper.java,
	org/omg/DynamicAny/AnySeqHelper.java,
	org/omg/DynamicAny/DynAnyFactoryHelper.java,
	org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCodeHelper.java,
	org/omg/DynamicAny/DynAnyHelper.java,
	org/omg/DynamicAny/DynAnyPackage/InvalidValueHelper.java,
	org/omg/DynamicAny/DynAnyPackage/TypeMismatchHelper.java,
	org/omg/DynamicAny/DynAnySeqHelper.java,
	org/omg/DynamicAny/DynArrayHelper.java,
	org/omg/DynamicAny/DynEnumHelper.java,
	org/omg/DynamicAny/DynFixedHelper.java,
	org/omg/DynamicAny/DynSequenceHelper.java,
	org/omg/DynamicAny/DynStructHelper.java,
	org/omg/DynamicAny/DynUnionHelper.java,
	org/omg/DynamicAny/DynValueHelper.java,
	org/omg/DynamicAny/NameDynAnyPairHelper.java,
	org/omg/DynamicAny/NameDynAnyPairSeqHelper.java,
	org/omg/DynamicAny/NameValuePairHelper.java,
	org/omg/DynamicAny/NameValuePairSeqHelper.java,
	org/omg/IOP/CodecFactoryHelper.java,
	org/omg/IOP/CodecFactoryPackage/UnknownEncodingHelper.java,
	org/omg/IOP/CodecPackage/FormatMismatchHelper.java,
	org/omg/IOP/CodecPackage/InvalidTypeForEncodingHelper.java,
	org/omg/IOP/CodecPackage/TypeMismatchHelper.java,
	org/omg/IOP/ComponentIdHelper.java,
	org/omg/IOP/IORHelper.java,
	org/omg/IOP/MultipleComponentProfileHelper.java,
	org/omg/IOP/ProfileIdHelper.java,
	org/omg/IOP/ServiceContextHelper.java,
	org/omg/IOP/ServiceContextListHelper.java,
	org/omg/IOP/ServiceIdHelper.java,
	org/omg/IOP/TaggedComponentHelper.java,
	org/omg/IOP/TaggedProfileHelper.java,
	org/omg/PortableInterceptor/AdapterManagerIdHelper.java,
	org/omg/PortableInterceptor/AdapterNameHelper.java,
	org/omg/PortableInterceptor/AdapterStateHelper.java,
	org/omg/PortableInterceptor/CurrentHelper.java,
	org/omg/PortableInterceptor/ForwardRequestHelper.java,
	org/omg/PortableInterceptor/IORInterceptor_3_0Helper.java,
	org/omg/PortableInterceptor/InvalidSlotHelper.java,
	org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateNameHelper.java,
	org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidNameHelper.java,
	org/omg/PortableInterceptor/ObjectReferenceFactoryHelper.java,
	org/omg/PortableInterceptor/ObjectReferenceTemplateHelper.java,
	org/omg/PortableInterceptor/ObjectReferenceTemplateSeqHelper.java,
	org/omg/PortableServer/CurrentHelper.java,
	org/omg/PortableServer/CurrentPackage/NoContextHelper.java,
	org/omg/PortableServer/ForwardRequestHelper.java,
	org/omg/PortableServer/POAHelper.java,
	org/omg/PortableServer/POAManagerPackage/AdapterInactiveHelper.java,
	org/omg/PortableServer/POAPackage/AdapterAlreadyExistsHelper.java,
	org/omg/PortableServer/POAPackage/AdapterNonExistentHelper.java,
	org/omg/PortableServer/POAPackage/InvalidPolicyHelper.java,
	org/omg/PortableServer/POAPackage/NoServantHelper.java,
	org/omg/PortableServer/POAPackage/ObjectAlreadyActiveHelper.java,
	org/omg/PortableServer/POAPackage/ObjectNotActiveHelper.java,
	org/omg/PortableServer/POAPackage/ServantAlreadyActiveHelper.java,
	org/omg/PortableServer/POAPackage/ServantNotActiveHelper.java,
	org/omg/PortableServer/POAPackage/WrongAdapterHelper.java,
	org/omg/PortableServer/POAPackage/WrongPolicyHelper.java,
	org/omg/PortableServer/ServantActivatorHelper.java,
	org/omg/PortableServer/ServantLocatorHelper.java: Remove the
	typecode caching and always use OrbRestricted.Singleton.

1 files changed, 8 insertions, 16 deletions

diff --git a/org/omg/PortableInterceptor/ForwardRequestHelper.java b/org/omg/PortableInterceptor/ForwardRequestHelper.java
index 5db56d745..8aa19a991 100644
--- a/org/omg/PortableInterceptor/ForwardRequestHelper.java
+++ b/org/omg/PortableInterceptor/ForwardRequestHelper.java
@@ -39,6 +39,7 @@ exception statement from your version. */
 package org.omg.PortableInterceptor;
 
 import gnu.CORBA.Minor;
+import gnu.CORBA.OrbRestricted;
 import gnu.CORBA.Interceptor.ForwardRequestHolder;
 
 import org.omg.CORBA.Any;
@@ -58,32 +59,23 @@ import org.omg.CORBA.portable.OutputStream;
 public abstract class ForwardRequestHelper
 {
   /**
-   * The cached typecode value, computed only once.
-   */
-  private static TypeCode typeCode;
-
-  /**
-       * Create the ForwardRequest typecode (structure, named "ForwardRequest"). The
+   * Create the ForwardRequest typecode (structure, named "ForwardRequest"). The
    * typecode states that the structure contains the following fields: forward.
    */
   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 = ObjectHelper.type();
-        members [ 0 ] = new StructMember("forward", field, null);
-        typeCode = orb.create_exception_tc(id(), "ForwardRequest", members);
-      }
-    return typeCode;
+    TypeCode field = ObjectHelper.type();
+    members[0] = new StructMember("forward", field, null);
+    return orb.create_exception_tc(id(), "ForwardRequest", members);
   }
 
   /**
    * Insert the ForwardRequest into the given Any. This method uses the
    * ForwardRequestHolder.
-   *
+   * 
    * @param any the Any to insert into.
    * @param that the ForwardRequest to insert.
    */