From d2231ec07e20ae3daa6e72fc178522e0776d64dc Mon Sep 17 00:00:00 2001
From: coffeys <unknown>
Date: Sat, 7 Jun 2014 10:09:30 +0100
Subject: [PATCH] 8042789: org.omg.CORBA.ORBSingletonClass loading no longer
 uses context class loader Reviewed-by: alanb, lancea

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

diff --git a/src/share/classes/org/omg/CORBA/ORB.java b/src/share/classes/org/omg/CORBA/ORB.java
index 0df6277..99197b2 100644
--- a/src/share/classes/org/omg/CORBA/ORB.java
+++ b/src/share/classes/org/omg/CORBA/ORB.java
@@ -291,28 +291,12 @@ abstract public class ORB {
                     (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)
-- 
GitLab