changeset 1070:3039f266eef2 jdk7u66-b16

Merge
author asaha
date Wed, 11 Jun 2014 11:29:53 -0700
parents d26696c96aa4 d765ed30bd5e
children 71a884f39dfb
files .hgtags
diffstat 2 files changed, 2 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Jun 03 14:22:55 2014 -0700
+++ b/.hgtags	Wed Jun 11 11:29:53 2014 -0700
@@ -463,6 +463,7 @@
 792ef0370bf7bcf83c9404d2b44f08722dcd73aa jdk7u65-b12
 b95f46ae5207853a89d52b0453a2fb99fffee817 jdk7u65-b13
 6efadedfe3295dbf2af4a350d813524af029b116 jdk7u65-b14
+78966cf34d868ef18b8a3fa7edec368e1cc4739d jdk7u65-b15
 5b8210c41bc41135687028bcb000ca116e2090f6 jdk7u66-b00
 9f0f0bdd4cfb01a5d64f9528b7ffda3974171120 jdk7u66-b01
 596d979a5d4deb9d10b068479276cd4b2a12432e jdk7u66-b09
--- a/src/share/classes/org/omg/CORBA/ORB.java	Tue Jun 03 14:22:55 2014 -0700
+++ b/src/share/classes/org/omg/CORBA/ORB.java	Wed Jun 11 11:29:53 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)