changeset 696:0eb0fa7e8a9e

Merge
author asaha
date Thu, 26 Jun 2014 07:51:50 -0700
parents 9d807a585678 7d1e0f0b63f1
children 689293315819
files .hgtags
diffstat 2 files changed, 2 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Jun 18 12:52:55 2014 -0700
+++ b/.hgtags	Thu Jun 26 07:51:50 2014 -0700
@@ -303,3 +303,4 @@
 90a428aa799d843cfc923031bd79f9e3896b49fa jdk8u20-b17
 2c5113522ce5b887ce060b6accf225095349fc3c jdk8u20-b18
 b078cb18ef95fe1afeacab70c2c313b6abbc959c jdk8u20-b19
+aca1d25d10812c86024d9dbb7ec529876cca55e8 jdk8u20-b20
--- a/src/share/classes/org/omg/CORBA/ORB.java	Wed Jun 18 12:52:55 2014 -0700
+++ b/src/share/classes/org/omg/CORBA/ORB.java	Thu Jun 26 07:51:50 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)