Mercurial > hg > release > icedtea7-forest-2.4 > corba
changeset 892:58b31c5bf14e icedtea-2.4.8
8042789: org.omg.CORBA.ORBSingletonClass loading no longer uses context class loader
Reviewed-by: alanb, lancea
author | coffeys |
---|---|
date | Sat, 07 Jun 2014 14:28:56 +0100 |
parents | 39f5a0f1b47c |
children | ae17beb7757a |
files | src/share/classes/org/omg/CORBA/ORB.java |
diffstat | 1 files changed, 1 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/org/omg/CORBA/ORB.java Thu Apr 17 17:20:03 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)