From e8e13c07053ab7995f130516c5f33a02d8faa9bb Mon Sep 17 00:00:00 2001 From: Steve Millidge Date: Thu, 25 Feb 2016 12:37:50 +0000 Subject: [PATCH] Merge pull request #676 from smillidge/PAYARA-642 Fixes #673 PAYARA-642 do explicit check for OSGi classloader --- .../glassfish/enterprise/iiop/impl/GlassFishORBManager.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/GlassFishORBManager.java b/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/GlassFishORBManager.java index e0afa5ea741..e1e99c7666c 100644 --- a/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/GlassFishORBManager.java +++ b/appserver/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); }