# HG changeset patch
# User asaha
# Date 1403796494 25200
# Node ID 99766341f294f81da08b9d26ac2995333f307c93
# Parent  a76e6e02711edbfab4931dc679cbd3df6169ec84# Parent  6892933158197d93e8924ab3e434f3a75abcc09c
Merge

diff -r a76e6e02711e -r 99766341f294 .hgtags
--- a/.hgtags	Wed Jun 18 13:29:54 2014 -0700
+++ b/.hgtags	Thu Jun 26 08:28:14 2014 -0700
@@ -270,6 +270,7 @@
 a2f7b36bfc1bc8df033fe5721b48fac1c3928a5b jdk8u5-b11
 475b96f6d8cecf720ca9fd6d332dd4bafb0f654c jdk8u5-b12
 897088ef059f53a8aa73267985666ad319223064 jdk8u5-b13
+0355626e88639a9b51b209f26f48dee28c924c72 jdk8u5-b31
 e2cfebaf3b9d0eae06c2d5ee7669180f1723f897 jdk8u11-b01
 152d1b91e5c5dfc940cccef1bfeae60a6604032a jdk8u11-b02
 60b073836311720d4f013d4493af2729ebe663f6 jdk8u11-b03
@@ -303,6 +304,7 @@
 90a428aa799d843cfc923031bd79f9e3896b49fa jdk8u20-b17
 2c5113522ce5b887ce060b6accf225095349fc3c jdk8u20-b18
 b078cb18ef95fe1afeacab70c2c313b6abbc959c jdk8u20-b19
+aca1d25d10812c86024d9dbb7ec529876cca55e8 jdk8u20-b20
 08aa9f55fe5bce1f04cfd2958f71e8df18643e29 jdk8u25-b00
 31f50e3c0dcbdfa7f11a895179065e6888c2cf3c jdk8u25-b01
 162703b7c2f16ce00d1b54a8f95d12eda9753eba jdk8u25-b02
diff -r a76e6e02711e -r 99766341f294 src/share/classes/org/omg/CORBA/ORB.java
--- a/src/share/classes/org/omg/CORBA/ORB.java	Wed Jun 18 13:29:54 2014 -0700
+++ b/src/share/classes/org/omg/CORBA/ORB.java	Thu Jun 26 08:28:14 2014 -0700
@@ -291,28 +291,12 @@
                     (className.equals("com.sun.corba.se.impl.orb.ORBSingleton"))) {
                 singleton = new com.sun.corba.se.impl.orb.ORBSingleton();
             } else {
-                singleton = create_impl_with_systemclassloader(className);
+                singleton = create_impl(className);
             }
         }
         return singleton;
     }
 
-   private static ORB create_impl_with_systemclassloader(String className) {
-
-        try {
-            ReflectUtil.checkPackageAccess(className);
-            ClassLoader cl = ClassLoader.getSystemClassLoader();
-            Class<org.omg.CORBA.ORB> orbBaseClass = org.omg.CORBA.ORB.class;
-            Class<?> singletonOrbClass = Class.forName(className, true, cl).asSubclass(orbBaseClass);
-            return (ORB)singletonOrbClass.newInstance();
-        } catch (Throwable ex) {
-            SystemException systemException = new INITIALIZE(
-                "can't instantiate default ORB implementation " + className);
-            systemException.initCause(ex);
-            throw systemException;
-        }
-    }
-
     private static ORB create_impl(String className) {
         ClassLoader cl = Thread.currentThread().getContextClassLoader();
         if (cl == null)