src/share/classes/com/sun/jndi/toolkit/corba/CorbaUtils.java

*** 156,177 ****
       * @param env    Possibly null environment. Contains environment properties.
       *               Could contain ORB itself; or applet used for initializing ORB.
       *               Use all String properties from env for initializing ORB
       * @return A non-null ORB.
       */
!     public static ORB getOrb(String server, int port, Hashtable env) {
          // See if we can get info from environment
          Properties orbProp;
  
          // Extract any org.omg.CORBA properties from environment
          if (env != null) {
              if (env instanceof Properties) {
                  // Already a Properties, just clone
                  orbProp = (Properties) env.clone();
              } else {
                  // Get all String properties
!                 Enumeration envProp;
                  orbProp = new Properties();
                  for (envProp = env.keys(); envProp.hasMoreElements();) {
                      String key = (String)envProp.nextElement();
                      Object val = env.get(key);
                      if (val instanceof String) {
--- 156,177 ----
       * @param env    Possibly null environment. Contains environment properties.
       *               Could contain ORB itself; or applet used for initializing ORB.
       *               Use all String properties from env for initializing ORB
       * @return A non-null ORB.
       */
!     public static ORB getOrb(String server, int port, Hashtable<?,?> env) {
          // See if we can get info from environment
          Properties orbProp;
  
          // Extract any org.omg.CORBA properties from environment
          if (env != null) {
              if (env instanceof Properties) {
                  // Already a Properties, just clone
                  orbProp = (Properties) env.clone();
              } else {
                  // Get all String properties
!                 Enumeration<?> envProp;
                  orbProp = new Properties();
                  for (envProp = env.keys(); envProp.hasMoreElements();) {
                      String key = (String)envProp.nextElement();
                      Object val = env.get(key);
                      if (val instanceof String) {
*** 237,247 ****
      }
  
      // Fields used for reflection of RMI-IIOP
      private static Method toStubMethod = null;
      private static Method connectMethod = null;
!     private static Class corbaStubClass = null;
      /**
       * Initializes reflection method handles for RMI-IIOP.
       * @exception ClassNotFoundException javax.rmi.CORBA.* not available
       */
      private static void initMethodHandles() throws ClassNotFoundException {
--- 237,247 ----
      }
  
      // Fields used for reflection of RMI-IIOP
      private static Method toStubMethod = null;
      private static Method connectMethod = null;
!     private static Class<?> corbaStubClass = null;
      /**
       * Initializes reflection method handles for RMI-IIOP.
       * @exception ClassNotFoundException javax.rmi.CORBA.* not available
       */
      private static void initMethodHandles() throws ClassNotFoundException {
*** 250,272 ****
  
          // Get javax.rmi.CORBA.Stub.connect(org.omg.CORBA.ORB) method
  
          try {
              connectMethod = corbaStubClass.getMethod("connect",
!                 new Class[] {org.omg.CORBA.ORB.class});
          } catch (NoSuchMethodException e) {
              throw new IllegalStateException(
          "No method definition for javax.rmi.CORBA.Stub.connect(org.omg.CORBA.ORB)");
          }
  
!         // Get javax.rmi.PortableRemoteObject method
!         Class proClass = Class.forName("javax.rmi.PortableRemoteObject");
  
!         // Get javax.rmi.PortableRemoteObject(java.rmi.Remote) method
          try {
              toStubMethod = proClass.getMethod("toStub",
!                 new Class[] {java.rmi.Remote.class});
  
          } catch (NoSuchMethodException e) {
              throw new IllegalStateException(
  "No method definition for javax.rmi.PortableRemoteObject.toStub(java.rmi.Remote)");
          }
--- 250,272 ----
  
          // Get javax.rmi.CORBA.Stub.connect(org.omg.CORBA.ORB) method
  
          try {
              connectMethod = corbaStubClass.getMethod("connect",
!                 new Class<>[] {org.omg.CORBA.ORB.class});
          } catch (NoSuchMethodException e) {
              throw new IllegalStateException(
          "No method definition for javax.rmi.CORBA.Stub.connect(org.omg.CORBA.ORB)");
          }
  
!         // Get javax.rmi.PortableRemoteObject class
!         Class<?> proClass = Class.forName("javax.rmi.PortableRemoteObject");
  
!         // Get javax.rmi.PortableRemoteObject.toStub(java.rmi.Remote) method
          try {
              toStubMethod = proClass.getMethod("toStub",
!                 new Class<?>[] {java.rmi.Remote.class});
  
          } catch (NoSuchMethodException e) {
              throw new IllegalStateException(
  "No method definition for javax.rmi.PortableRemoteObject.toStub(java.rmi.Remote)");
          }