Merge pull request #25813 from dmatej/referencecleaner

Fixed NPE and noticed NPE in JDK code

Author: dmatej

appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/managedbean/ManagedBeanManagerImpl.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2024 Contributors to the Eclipse Foundation.
+ * Copyright (c) 2022, 2025 Contributors to the Eclipse Foundation.
  * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -418,7 +418,9 @@ public <T> T createManagedBean(ManagedBeanDescriptor managedBeanDescriptor, Clas
 
             // Need to keep track of context in order to destroy properly
             Map<Object, CDIInjectionContext> bundleNonManagedObjs = cdiManagedBeanInstanceMap.get(bundleDescriptor);
-            bundleNonManagedObjs.put(callerObject, cdiContext);
+            if (bundleNonManagedObjs != null) {
+                bundleNonManagedObjs.put(callerObject, cdiContext);
+            }
 
         } else {
             JavaEEInterceptorBuilder interceptorBuilder = (JavaEEInterceptorBuilder) managedBeanDescriptor.getInterceptorBuilder();

appserver/tests/tck/embedded_ejb_smoke/runner/pom.xml

@@ -59,6 +59,11 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.glassfish.main</groupId>
+            <artifactId>glassfish-jul-extension</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.glassfish.main.distributions</groupId>
             <artifactId>glassfish</artifactId>

appserver/tests/tck/embedded_ejb_smoke/runner/src/test/java/com/sun/ts/run/EmbeddedRunnerITest.java

@@ -16,6 +16,7 @@
 package com.sun.ts.run;
 
 import com.sun.ts.lib.harness.ExecTSTestCmd;
+import com.sun.javatest.Status;
 
 import java.io.IOException;
 import java.io.OutputStreamWriter;
@@ -80,13 +81,14 @@ List<String> getJavaOptions() {
                 "-Djava.util.logging.config.file=" + System.getProperty("glassfish.home") + "/glassfish/domains/domain1/config/logging.properties",
                 "-Dtest.ejb.stateful.timeout.wait.seconds=180 ",
                 "-Ddeliverable.class=com.sun.ts.lib.deliverable.cts.CTSDeliverable",
-
+                "--module-path", System.getProperty("glassfish.home") + "/glassfish/lib/bootstrap",
+                "--add-modules", "ALL-MODULE-PATH",
                 "--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED",
                 "--add-opens=java.base/sun.net.www.protocol.jrt=ALL-UNNAMED",
                 "--add-opens=java.base/java.lang=ALL-UNNAMED",
                 "--add-opens=java.base/java.util=ALL-UNNAMED",
                 "--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED",
-                "--add-opens=java.naming/javax.naming.spi=ALL-UNNAMED")
+                "--add-opens=java.naming/javax.naming.spi=org.glassfish.main.jdke")
             ;
 
         if (System.getProperty("maven.tck.debug") != null && !System.getProperty("maven.tck.debug").isEmpty()) {
@@ -124,10 +126,8 @@ String getClassPath() {
 
         return String.join(":", List.of(
             localRepository + "/org/glassfish/main/tests/tck/tsharness/" + glassfishVersion + "/tsharness-" + glassfishVersion + ".jar",
-            localRepository + "/org/apache/commons/commons-lang3/3.3.2/commons-lang3-3.3.2.jar",
             System.getProperty("glassfish.home") + "/glassfish/lib/embedded/glassfish-embedded-static-shell.jar",
             copiedEjbJar.toString()
         ));
     }
-
 }

appserver/web/war-util/src/main/java/org/glassfish/web/loader/ReferenceCleaner.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023 Contributors to the Eclipse Foundation
+ * Copyright (c) 2022, 2025 Contributors to the Eclipse Foundation
  * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
@@ -134,13 +134,12 @@ private void checkThreadLocalsForLeaks() {
                 }
                 final Object threadLocalMap = threadLocalsField.get(thread);
                 if (threadLocalMap != null) {
-                    expungeStaleEntriesMethod.invoke(threadLocalMap);
+                    expungeStaleEntries(expungeStaleEntriesMethod, threadLocalMap);
                     checkThreadLocalMapForLeaks(threadLocalMap, tableField);
                 }
-
                 final Object inheritableMap = inheritableThreadLocalsField.get(thread);
                 if (inheritableMap != null) {
-                    expungeStaleEntriesMethod.invoke(inheritableMap);
+                    expungeStaleEntries(expungeStaleEntriesMethod, inheritableMap);
                     checkThreadLocalMapForLeaks(inheritableMap, tableField);
                 }
             }
@@ -180,6 +179,17 @@ private Thread[] getThreads() {
     }
 
 
+    private void expungeStaleEntries(final Method expungeStaleEntriesMethod, final Object threadLocalMap)
+        throws ReflectiveOperationException {
+        try {
+            expungeStaleEntriesMethod.invoke(threadLocalMap);
+        } catch (NullPointerException e) {
+            // tab[staleSlot] can be null in ThreadLocalMap.expungeStaleEntry, seen in test logs
+            LOG.log(WARNING, "Detected NPE caused by the JDK code, cleanup of thread locals failed.", e);
+        }
+    }
+
+
     /**
      * Analyzes the given thread local map object. Also pass in the field that
      * points to the internal table to save re-calculating it on every