Mercurial > jdk8-mips64-public > corba / changeset

     1.1 --- a/src/share/classes/org/omg/CORBA/ORB.java	Wed Jun 18 12:34:09 2014 -0700
     1.2 +++ b/src/share/classes/org/omg/CORBA/ORB.java	Thu Jun 19 17:59:24 2014 -0700
     1.3 @@ -291,28 +291,12 @@
     1.4                      (className.equals("com.sun.corba.se.impl.orb.ORBSingleton"))) {
     1.5                  singleton = new com.sun.corba.se.impl.orb.ORBSingleton();
     1.6              } else {
     1.7 -                singleton = create_impl_with_systemclassloader(className);
     1.8 +                singleton = create_impl(className);
     1.9              }
    1.10          }
    1.11          return singleton;
    1.12      }
    1.13  
    1.14 -   private static ORB create_impl_with_systemclassloader(String className) {
    1.15 -
    1.16 -        try {
    1.17 -            ReflectUtil.checkPackageAccess(className);
    1.18 -            ClassLoader cl = ClassLoader.getSystemClassLoader();
    1.19 -            Class<org.omg.CORBA.ORB> orbBaseClass = org.omg.CORBA.ORB.class;
    1.20 -            Class<?> singletonOrbClass = Class.forName(className, true, cl).asSubclass(orbBaseClass);
    1.21 -            return (ORB)singletonOrbClass.newInstance();
    1.22 -        } catch (Throwable ex) {
    1.23 -            SystemException systemException = new INITIALIZE(
    1.24 -                "can't instantiate default ORB implementation " + className);
    1.25 -            systemException.initCause(ex);
    1.26 -            throw systemException;
    1.27 -        }
    1.28 -    }
    1.29 -
    1.30      private static ORB create_impl(String className) {
    1.31          ClassLoader cl = Thread.currentThread().getContextClassLoader();
    1.32          if (cl == null)