changeset 1076:3c9d70a1ae17

Merge
author asaha
date Wed, 18 Jun 2014 08:43:46 -0700
parents 4c4a40cebbc9 8740dc71b1ce
children 50e4090a8583 d2f7358b01d3
files .hgtags
diffstat 2 files changed, 3 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Jun 04 18:42:17 2014 -0700
+++ b/.hgtags	Wed Jun 18 08:43:46 2014 -0700
@@ -465,3 +465,5 @@
 b95f46ae5207853a89d52b0453a2fb99fffee817 jdk7u65-b13
 6efadedfe3295dbf2af4a350d813524af029b116 jdk7u65-b14
 78966cf34d868ef18b8a3fa7edec368e1cc4739d jdk7u65-b15
+d765ed30bd5ed2bdd71fda56c056333e1b4b0d7d jdk7u65-b16
+cd642d59aca29ff2b56e7ed016be758828f199cd jdk7u65-b17
--- a/src/share/classes/org/omg/CORBA/ORB.java	Wed Jun 04 18:42:17 2014 -0700
+++ b/src/share/classes/org/omg/CORBA/ORB.java	Wed Jun 18 08:43:46 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)