Simplified if in GlassFishORBHelper

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
eclipse-ee4j · Feb 13, 2024 · 34a3814 · 34a3814
1 parent d0ba42d
commit 34a3814
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/...orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/api/GlassFishORBHelper.java b/...orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/api/GlassFishORBHelper.java
@@ -129,11 +129,9 @@ public ORB getORB() {
                 // Any callbacks that result from the protocol manager initialization itself cannot
                 // depend on having access to the protocol manager.
                 orb = orbFactory.createORB(props);
-
-                if (!isServer || protocolManager != null) {
-                    return orb;
+                if (isServer && protocolManager == null) {
+                    protocolManager = initProtocolManager(orb);
                 }
-                protocolManager = initProtocolManager(orb);
                 return orb;
             } catch (Exception e) {
                 orb = null;