Mercurial > jdk8-mips64-public > corba / changeset

     1.1 --- a/.hgtags	Wed Jun 18 13:29:54 2014 -0700
     1.2 +++ b/.hgtags	Thu Jun 26 08:28:14 2014 -0700
     1.3 @@ -270,6 +270,7 @@
     1.4  a2f7b36bfc1bc8df033fe5721b48fac1c3928a5b jdk8u5-b11
     1.5  475b96f6d8cecf720ca9fd6d332dd4bafb0f654c jdk8u5-b12
     1.6  897088ef059f53a8aa73267985666ad319223064 jdk8u5-b13
     1.7 +0355626e88639a9b51b209f26f48dee28c924c72 jdk8u5-b31
     1.8  e2cfebaf3b9d0eae06c2d5ee7669180f1723f897 jdk8u11-b01
     1.9  152d1b91e5c5dfc940cccef1bfeae60a6604032a jdk8u11-b02
    1.10  60b073836311720d4f013d4493af2729ebe663f6 jdk8u11-b03
    1.11 @@ -303,6 +304,7 @@
    1.12  90a428aa799d843cfc923031bd79f9e3896b49fa jdk8u20-b17
    1.13  2c5113522ce5b887ce060b6accf225095349fc3c jdk8u20-b18
    1.14  b078cb18ef95fe1afeacab70c2c313b6abbc959c jdk8u20-b19
    1.15 +aca1d25d10812c86024d9dbb7ec529876cca55e8 jdk8u20-b20
    1.16  08aa9f55fe5bce1f04cfd2958f71e8df18643e29 jdk8u25-b00
    1.17  31f50e3c0dcbdfa7f11a895179065e6888c2cf3c jdk8u25-b01
    1.18  162703b7c2f16ce00d1b54a8f95d12eda9753eba jdk8u25-b02

     2.1 --- a/src/share/classes/org/omg/CORBA/ORB.java	Wed Jun 18 13:29:54 2014 -0700
     2.2 +++ b/src/share/classes/org/omg/CORBA/ORB.java	Thu Jun 26 08:28:14 2014 -0700
     2.3 @@ -291,28 +291,12 @@
     2.4                      (className.equals("com.sun.corba.se.impl.orb.ORBSingleton"))) {
     2.5                  singleton = new com.sun.corba.se.impl.orb.ORBSingleton();
     2.6              } else {
     2.7 -                singleton = create_impl_with_systemclassloader(className);
     2.8 +                singleton = create_impl(className);
     2.9              }
    2.10          }
    2.11          return singleton;
    2.12      }
    2.13  
    2.14 -   private static ORB create_impl_with_systemclassloader(String className) {
    2.15 -
    2.16 -        try {
    2.17 -            ReflectUtil.checkPackageAccess(className);
    2.18 -            ClassLoader cl = ClassLoader.getSystemClassLoader();
    2.19 -            Class<org.omg.CORBA.ORB> orbBaseClass = org.omg.CORBA.ORB.class;
    2.20 -            Class<?> singletonOrbClass = Class.forName(className, true, cl).asSubclass(orbBaseClass);
    2.21 -            return (ORB)singletonOrbClass.newInstance();
    2.22 -        } catch (Throwable ex) {
    2.23 -            SystemException systemException = new INITIALIZE(
    2.24 -                "can't instantiate default ORB implementation " + className);
    2.25 -            systemException.initCause(ex);
    2.26 -            throw systemException;
    2.27 -        }
    2.28 -    }
    2.29 -
    2.30      private static ORB create_impl(String className) {
    2.31          ClassLoader cl = Thread.currentThread().getContextClassLoader();
    2.32          if (cl == null)