Merge pull request #676 from smillidge/PAYARA-642

Fixes #673 PAYARA-642 do explicit check for OSGi classloader
payara · Feb 26, 2016 · e8e13c0 · e8e13c0
1 parent 799a873
commit e8e13c0
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/...er/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/GlassFishORBManager.java b/...er/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/GlassFishORBManager.java
@@ -585,11 +585,10 @@ private void initORB(Properties props) {
             orb = ORBFactory.create() ;
             prevCL = Utility.getClassLoader();
             try {
-               if (processType != processType.Other) {
+              if (processType != processType.Other && !prevCL.getClass().getName().contains("OSGi")) {
                 Utility.setContextClassLoader(prevCL.getParent());
                }
-
-                ORBFactory.initialize( orb, args, orbInitProperties, useOSGI);
+               ORBFactory.initialize( orb, args, orbInitProperties, useOSGI);
             } finally {
                 Utility.setContextClassLoader(prevCL);
             }