src/share/classes/com/sun/jndi/ldap/Connection.java

*** 236,266 ****
       */
      private Object createInetSocketAddress(String host, int port)
              throws NoSuchMethodException {
  
          try {
!             Class inetSocketAddressClass =
                  Class.forName("java.net.InetSocketAddress");
  
!             Constructor inetSocketAddressCons =
!                 inetSocketAddressClass.getConstructor(new Class[]{
                  String.class, int.class});
  
              return inetSocketAddressCons.newInstance(new Object[]{
                  host, new Integer(port)});
  
!         } catch (ClassNotFoundException e) {
              throw new NoSuchMethodException();
  
-         } catch (InstantiationException e) {
-             throw new NoSuchMethodException();
- 
-         } catch (InvocationTargetException e) {
-             throw new NoSuchMethodException();
- 
-         } catch (IllegalAccessException e) {
-             throw new NoSuchMethodException();
          }
      }
  
      /*
       * Create a Socket object using the specified socket factory and time limit.
--- 236,261 ----
       */
      private Object createInetSocketAddress(String host, int port)
              throws NoSuchMethodException {
  
          try {
!             Class<?> inetSocketAddressClass =
                  Class.forName("java.net.InetSocketAddress");
  
!             Constructor<?> inetSocketAddressCons =
!                 inetSocketAddressClass.getConstructor(new Class<?>[]{
                  String.class, int.class});
  
              return inetSocketAddressCons.newInstance(new Object[]{
                  host, new Integer(port)});
  
!         } catch (ClassNotFoundException |
!                  InstantiationException |
!                  InvocationTargetException |
!                  IllegalAccessException e) {
              throw new NoSuchMethodException();
  
          }
      }
  
      /*
       * Create a Socket object using the specified socket factory and time limit.
*** 278,304 ****
  
          if (socketFactory != null) {
  
              // create the factory
  
!             Class socketFactoryClass = Obj.helper.loadClass(socketFactory);
              Method getDefault =
!                 socketFactoryClass.getMethod("getDefault", new Class[]{});
              Object factory = getDefault.invoke(null, new Object[]{});
  
              // create the socket
  
              Method createSocket = null;
  
              if (connectTimeout > 0) {
  
                  try {
                      createSocket = socketFactoryClass.getMethod("createSocket",
!                         new Class[]{});
  
                      Method connect = Socket.class.getMethod("connect",
!                         new Class[]{Class.forName("java.net.SocketAddress"),
                          int.class});
                      Object endpoint = createInetSocketAddress(host, port);
  
                      // unconnected socket
                      socket =
--- 273,299 ----
  
          if (socketFactory != null) {
  
              // create the factory
  
!             Class<?> socketFactoryClass = Obj.helper.loadClass(socketFactory);
              Method getDefault =
!                 socketFactoryClass.getMethod("getDefault", new Class<?>[]{});
              Object factory = getDefault.invoke(null, new Object[]{});
  
              // create the socket
  
              Method createSocket = null;
  
              if (connectTimeout > 0) {
  
                  try {
                      createSocket = socketFactoryClass.getMethod("createSocket",
!                         new Class<?>[]{});
  
                      Method connect = Socket.class.getMethod("connect",
!                         new Class<?>[]{Class.forName("java.net.SocketAddress"),
                          int.class});
                      Object endpoint = createInetSocketAddress(host, port);
  
                      // unconnected socket
                      socket =
*** 318,328 ****
                  }
              }
  
              if (socket == null) {
                  createSocket = socketFactoryClass.getMethod("createSocket",
!                     new Class[]{String.class, int.class});
  
                  if (debug) {
                      System.err.println("Connection: creating socket using " +
                          "supplied socket factory");
                  }
--- 313,323 ----
                  }
              }
  
              if (socket == null) {
                  createSocket = socketFactoryClass.getMethod("createSocket",
!                     new Class<?>[]{String.class, int.class});
  
                  if (debug) {
                      System.err.println("Connection: creating socket using " +
                          "supplied socket factory");
                  }
*** 333,351 ****
          } else {
  
              if (connectTimeout > 0) {
  
                  try {
!                     Constructor socketCons =
!                         Socket.class.getConstructor(new Class[]{});
  
                      Method connect = Socket.class.getMethod("connect",
!                         new Class[]{Class.forName("java.net.SocketAddress"),
                          int.class});
                      Object endpoint = createInetSocketAddress(host, port);
  
!                     socket = (Socket) socketCons.newInstance(new Object[]{});
  
                      if (debug) {
                          System.err.println("Connection: creating socket with " +
                              "a timeout");
                      }
--- 328,346 ----
          } else {
  
              if (connectTimeout > 0) {
  
                  try {
!                     Constructor<Socket> socketCons =
!                         Socket.class.getConstructor(new Class<?>[]{});
  
                      Method connect = Socket.class.getMethod("connect",
!                         new Class<?>[]{Class.forName("java.net.SocketAddress"),
                          int.class});
                      Object endpoint = createInetSocketAddress(host, port);
  
!                     socket = socketCons.newInstance(new Object[]{});
  
                      if (debug) {
                          System.err.println("Connection: creating socket with " +
                              "a timeout");
                      }