Merge pull request #32833 from jimmy1wu/32787

fallback to NamingManagerHelper regardless of JDK version

Author: jimmy1wu

dev/com.ibm.ws.org.apache.aries.jndi.core/src/org/apache/aries/jndi/startup/Activator.java

@@ -19,16 +19,13 @@
 package org.apache.aries.jndi.startup;
 
 import java.lang.reflect.Field;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.Supplier;
 
 import javax.naming.NamingException;
 import javax.naming.spi.InitialContextFactory;
@@ -89,34 +86,6 @@ public class Activator implements BundleActivator {
     private ObjectFactoryBuilder originalOFBuilder;
     private OSGiObjectFactoryBuilder ofBuilder;
 
-    //In Java20+ the ObjectFactoryBuilder static field is in the NamingManagerHelper class.
-    private final Class<?> objectFactoryBuilderHolder = new Supplier<Class<?>>() {
-        @Override
-        public Class<?> get() {
-            if (javaMajorVersion() >= 20) {
-                try {
-                    return Class.forName("com.sun.naming.internal.NamingManagerHelper");
-                } catch (ClassNotFoundException e) {
-                }
-            }
-            return NamingManager.class;
-        }
-    }.get();
-
-    private int javaMajorVersion() {
-        String version = AccessController.doPrivileged(new PrivilegedAction<String>() {
-            @Override
-            public String run() {
-                return System.getProperty("java.version");
-            }
-        });
-
-        String[] versionElements = version.split("\\D");
-
-        // Pre-JDK 9 java.version is 1.MAJOR.MINOR. Post-JDK 9 java.version is MAJOR.MINOR
-        return Integer.valueOf(versionElements[Integer.valueOf(versionElements[0]) == 1 ? 1 : 0]);
-    }
-
     public static Collection<ServiceReference<InitialContextFactoryBuilder>> getInitialContextFactoryBuilderServices() {
         return instance.icfBuilders.getReferences();
     }
@@ -231,7 +200,7 @@ public void modifiedBundle(Bundle bundle, BundleEvent event, ServiceCache object
                 } catch (IllegalStateException e) {
                     // use reflection to force the builder to be used
                     if (isPropertyEnabled(context, FORCE_BUILDER)) {
-                        originalOFBuilder = swapStaticField(objectFactoryBuilderHolder, ObjectFactoryBuilder.class, builder);
+                        swapObjectFactoryBuilderStaticField(builder);
                     }
                 }
                 ofBuilder = builder;
@@ -266,7 +235,7 @@ public void stop(BundleContext context) {
             swapStaticField(NamingManager.class, InitialContextFactoryBuilder.class, originalICFBuilder);
         }
         if (ofBuilder != null) {
-            swapStaticField(objectFactoryBuilderHolder, ObjectFactoryBuilder.class, originalOFBuilder);
+            swapObjectFactoryBuilderStaticField(originalOFBuilder);
         }
 
         icfBuilders.close();
@@ -277,6 +246,23 @@ public void stop(BundleContext context) {
         instance = null;
     }
 
+    private void swapObjectFactoryBuilderStaticField(ObjectFactoryBuilder value) {
+        try {
+            // Try in NamingManager first.
+            swapStaticField(NamingManager.class, ObjectFactoryBuilder.class, value);
+        } catch (IllegalStateException ise) {
+            // The field may have been moved to NamingManagerHelper depending on the JDK version, so let's try there.
+            try {
+                Class<?> namingManagerHelperClass = Class.forName("com.sun.naming.internal.NamingManagerHelper");
+                swapStaticField(namingManagerHelperClass, ObjectFactoryBuilder.class, value);
+            } catch (ClassNotFoundException cnfe) {
+                // The NamingManagerHelper class does not exist, so the IllegalStateException may have been
+                // due to another reason, so let's throw the original exception.
+                throw ise;
+            }
+        }
+    }
+
     private boolean isPropertyEnabled(BundleContext context, String key) {
         String value = context.getProperty(key);
         if ("false".equals(value))