/hg/release/icedtea7-forest-2.5/corba: 8042789: org.omg.CORBA.OR...

[andrew at icedtea.classpath.org]

changeset 9733c3d6fd78 in /hg/release/icedtea7-forest-2.5/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/corba?cmd=changeset;node=9733c3d6fd78
author: coffeys
date: Sat Jun 07 14:28:56 2014 +0100

	8042789: org.omg.CORBA.ORBSingletonClass loading no longer uses context class loader
	Reviewed-by: alanb, lancea


diffstat:

 src/share/classes/org/omg/CORBA/ORB.java |  18 +-----------------
 1 files changed, 1 insertions(+), 17 deletions(-)

diffs (33 lines):

diff -r 8c910b5d3b77 -r 9733c3d6fd78 src/share/classes/org/omg/CORBA/ORB.java
--- a/src/share/classes/org/omg/CORBA/ORB.java	Sat Jun 14 08:07:58 2014 +0100
+++ b/src/share/classes/org/omg/CORBA/ORB.java	Sat Jun 07 14:28:56 2014 +0100
@@ -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)