Removed dead code - the class is not available in JDK11+

eclipse-ee4j · Jul 15, 2022 · 41eebdc · 41eebdc
1 parent f3b5f4c
commit 41eebdc
Showing 1 changed file with 14 additions and 41 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
@@ -295,52 +295,25 @@ private void initProperties() {
      * to a different ORB than the RMI-IIOP delegates.
      */
     private void setORBSystemProperties() {
-        java.security.AccessController.doPrivileged(
-            new java.security.PrivilegedAction<Object>() {
-                @Override
-                public java.lang.Object run() {
-                    if (System.getProperty(OMG_ORB_CLASS_PROPERTY) == null) {
-                        // set ORB based on JVM vendor
-                        if (System.getProperty("java.vendor").equals(
-                            "Sun Microsystems Inc.")) {
-                            System.setProperty(OMG_ORB_CLASS_PROPERTY,
-                                ORB_SE_CLASS);
-                        } else {
-                            // if not Sun, then set to EE class
-                            System.setProperty(OMG_ORB_CLASS_PROPERTY,
-                                ORB_CLASS);
-                        }
-                    }
-
-                    if (System.getProperty(
-                        OMG_ORB_SINGLETON_CLASS_PROPERTY) == null) {
-                        // set ORBSingleton based on JVM vendor
-                        if (System.getProperty("java.vendor").equals(
-                            "Sun Microsystems Inc.")) {
-                            System.setProperty(
-                                OMG_ORB_SINGLETON_CLASS_PROPERTY,
-                                ORB_SE_SINGLETON_CLASS);
-                        } else {
-                            // if not Sun, then set to EE class
-                            System.setProperty(
-                                OMG_ORB_SINGLETON_CLASS_PROPERTY,
-                                ORB_SINGLETON_CLASS);
-                        }
-                    }
+        java.security.AccessController.doPrivileged(new java.security.PrivilegedAction<Object>() {
 
-                    System.setProperty(ORB_UTIL_CLASS_PROPERTY,
-                            RMI_UTIL_CLASS);
+            @Override
+            public java.lang.Object run() {
+                if (System.getProperty(OMG_ORB_CLASS_PROPERTY) == null) {
+                    System.setProperty(OMG_ORB_CLASS_PROPERTY, ORB_CLASS);
+                }
 
-                    System.setProperty(RMIIIOP_STUB_DELEGATE_CLASS_PROPERTY,
-                            RMI_STUB_CLASS);
+                if (System.getProperty(OMG_ORB_SINGLETON_CLASS_PROPERTY) == null) {
+                    System.setProperty(OMG_ORB_SINGLETON_CLASS_PROPERTY, ORB_SINGLETON_CLASS);
+                }
 
-                    System.setProperty(RMIIIOP_PRO_DELEGATE_CLASS_PROPERTY,
-                            RMI_PRO_CLASS);
+                System.setProperty(ORB_UTIL_CLASS_PROPERTY, RMI_UTIL_CLASS);
+                System.setProperty(RMIIIOP_STUB_DELEGATE_CLASS_PROPERTY, RMI_STUB_CLASS);
+                System.setProperty(RMIIIOP_PRO_DELEGATE_CLASS_PROPERTY, RMI_PRO_CLASS);
 
-                    return null;
-                }
+                return null;
             }
-        );
+        });
     }
 
     /**