Merge pull request #28 from jGauravGupta/FISH-6432-6x

FISH-6432 Applications Take Longer To Deploy on JDK 17 (Payara 6.x)
payara · Feb 6, 2023 · aa3e272 · aa3e272
2 parents 84cd5da + 9fff4aa
commit aa3e272
Show file tree

Hide file tree

Showing 81 changed files with 186 additions and 120 deletions.
diff --git a/bom/pom.xml b/bom/pom.xml
@@ -28,7 +28,7 @@
     </parent>
     <groupId>org.glassfish.hk2</groupId>
     <artifactId>hk2-bom</artifactId>
-    <version>3.0.1.payara-p1</version>
+    <version>3.0.1.payara-p2</version>
     <packaging>pom</packaging>
 
     <name>HK2 Bom Pom</name>

diff --git a/class-model/pom.xml b/class-model/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-parent</artifactId>
-        <version>3.0.1.payara-p1</version>
+        <version>3.0.1.payara-p2</version>
     </parent>
 
     <groupId>org.glassfish.hk2</groupId>

diff --git a/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/TypeImpl.java b/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/TypeImpl.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023 Payara Foundation and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -47,14 +48,6 @@ public Collection<URI> getDefiningURIs() {
 
     synchronized void addDefiningURI(URI uri) {
         definingURIs.add(uri);
-        try {
-            File file = new File(uri);
-//            assert(file.exists()) : file + " does not exist";
-            definingURIs.add(file.getCanonicalFile().toURI());
-        } catch (IOException e) {
-            // ignore, this is a safeguard for confused user's code that do not
-            // deal well with file path.
-        }
     }
 
     @Override

diff --git a/examples/caching/pom.xml b/examples/caching/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>examples</artifactId>
-        <version>3.0.1.payara-p1</version>
+        <version>3.0.1.payara-p2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/examples/caching/runner/pom.xml b/examples/caching/runner/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>caching-aop-example</artifactId>
-        <version>3.0.1.payara-p1</version>
+        <version>3.0.1.payara-p2</version>
     </parent>
 
     <artifactId>caching-aop-example-runner</artifactId>

diff --git a/examples/caching/system/pom.xml b/examples/caching/system/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>caching-aop-example</artifactId>
-        <version>3.0.1.payara-p1</version>
+        <version>3.0.1.payara-p2</version>
     </parent>
 
     <artifactId>caching-aop-example-system</artifactId>

diff --git a/examples/configuration/pom.xml b/examples/configuration/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>examples</artifactId>
-        <version>3.0.1.payara-p1</version>
+        <version>3.0.1.payara-p2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/examples/configuration/webserver/pom.xml b/examples/configuration/webserver/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>configuration-examples</artifactId>
-        <version>3.0.1.payara-p1</version>
+        <version>3.0.1.payara-p2</version>
     </parent>
 
     <artifactId>webserver-configuration-example</artifactId>

diff --git a/examples/configuration/xml/pom.xml b/examples/configuration/xml/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>configuration-examples</artifactId>
-        <version>3.0.1.payara-p1</version>
+        <version>3.0.1.payara-p2</version>
     </parent>
 
     <artifactId>xml-configuration-example</artifactId>

diff --git a/examples/custom-resolver/pom.xml b/examples/custom-resolver/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>examples</artifactId>
-        <version>3.0.1.payara-p1</version>
+        <version>3.0.1.payara-p2</version>
     </parent>
     <artifactId>custom-resolver-example</artifactId>
     <name>Custom Resolver Example</name>

diff --git a/examples/events/pom.xml b/examples/events/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>examples</artifactId>
-        <version>3.0.1.payara-p1</version>
+        <version>3.0.1.payara-p2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/examples/events/threaded/pom.xml b/examples/events/threaded/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>event-examples</artifactId>
-        <version>3.0.1.payara-p1</version>
+        <version>3.0.1.payara-p2</version>
     </parent>
 
     <artifactId>threading-event-example</artifactId>

diff --git a/examples/operations/pom.xml b/examples/operations/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>examples</artifactId>
-        <version>3.0.1.payara-p1</version>
+        <version>3.0.1.payara-p2</version>
     </parent>
     <artifactId>operations-example</artifactId>
     <name>Operations Example</name>

diff --git a/examples/pom.xml b/examples/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-parent</artifactId>
-        <version>3.0.1.payara-p1</version>
+        <version>3.0.1.payara-p2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/examples/security-lockdown/alice/pom.xml b/examples/security-lockdown/alice/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>security-lockdown-example</artifactId>
-        <version>3.0.1.payara-p1</version>
+        <version>3.0.1.payara-p2</version>
     </parent>
 
     <artifactId>security-lockdown-example-alice</artifactId>

diff --git a/examples/security-lockdown/mallory/pom.xml b/examples/security-lockdown/mallory/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>security-lockdown-example</artifactId>
-        <version>3.0.1.payara-p1</version>
+        <version>3.0.1.payara-p2</version>
     </parent>
 
     <artifactId>security-lockdown-example-mallory</artifactId>

diff --git a/examples/security-lockdown/pom.xml b/examples/security-lockdown/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>examples</artifactId>
-        <version>3.0.1.payara-p1</version>
+        <version>3.0.1.payara-p2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/examples/security-lockdown/runner/pom.xml b/examples/security-lockdown/runner/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>security-lockdown-example</artifactId>
-        <version>3.0.1.payara-p1</version>
+        <version>3.0.1.payara-p2</version>
     </parent>
 
     <artifactId>security-lockdown-example-runner</artifactId>

diff --git a/examples/security-lockdown/system/pom.xml b/examples/security-lockdown/system/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>security-lockdown-example</artifactId>
-        <version>3.0.1.payara-p1</version>
+        <version>3.0.1.payara-p2</version>
     </parent>
 
     <artifactId>security-lockdown-example-system</artifactId>

diff --git a/external/aopalliance/pom.xml b/external/aopalliance/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>external</artifactId>
-        <version>3.0.1.payara-p1</version>
+        <version>3.0.1.payara-p2</version>
     </parent>
     <groupId>org.glassfish.hk2.external</groupId>
     <artifactId>aopalliance-repackaged</artifactId>

diff --git a/external/pom.xml b/external/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-parent</artifactId>
-        <version>3.0.1.payara-p1</version>
+        <version>3.0.1.payara-p2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/guice-bridge/pom.xml b/guice-bridge/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-parent</artifactId>
-        <version>3.0.1.payara-p1</version>
+        <version>3.0.1.payara-p2</version>
     </parent>
     <groupId>org.glassfish.hk2</groupId>
     <artifactId>guice-bridge</artifactId>

diff --git a/hk2-api/pom.xml b/hk2-api/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-parent</artifactId>
-        <version>3.0.1.payara-p1</version>
+        <version>3.0.1.payara-p2</version>
     </parent>
     <groupId>org.glassfish.hk2</groupId>
     <artifactId>hk2-api</artifactId>

diff --git a/hk2-api/src/main/java/org/glassfish/hk2/internal/InheritableThreadContext.java b/hk2-api/src/main/java/org/glassfish/hk2/internal/InheritableThreadContext.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2014, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023 Payara Foundation and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -17,6 +18,7 @@
 package org.glassfish.hk2.internal;
 
 import java.lang.annotation.Annotation;
+import org.glassfish.hk2.utilities.CleanerFactory;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.util.HashMap;
@@ -114,10 +116,14 @@ public void destroyOne(ActiveDescriptor<?> descriptor) {
     }
 
     private static class InheritableContextThreadWrapper {
-        private final HashMap<ActiveDescriptor<?>, Object> instances =
-                new HashMap<ActiveDescriptor<?>, Object>();
+
+        private final HashMap<ActiveDescriptor<?>, Object> instances = new HashMap<>();
         private final long id = Thread.currentThread().getId();
 
+        public InheritableContextThreadWrapper() {
+            registerStopEvent();
+        }
+
         public boolean has(ActiveDescriptor<?> d) {
             return instances.containsKey(d);
         }
@@ -130,13 +136,14 @@ public void put(ActiveDescriptor<?> d, Object v) {
             instances.put(d, v);
         }
 
-        @Override
-        public void finalize() throws Throwable {
-            instances.clear();
+        public final void registerStopEvent() {
+            CleanerFactory.create().register(this, () -> {
+                instances.clear();
 
-            if (LOG_THREAD_DESTRUCTION) {
-                Logger.getLogger().debug("Removing PerThreadContext data for thread " + id);
-            }
+                if (LOG_THREAD_DESTRUCTION) {
+                    Logger.getLogger().debug("Removing PerThreadContext data for thread " + id);
+                }
+            });
         }
 
     }

diff --git a/hk2-api/src/main/java/org/glassfish/hk2/internal/PerThreadContext.java b/hk2-api/src/main/java/org/glassfish/hk2/internal/PerThreadContext.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023 Payara Foundation and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -17,6 +18,7 @@
 package org.glassfish.hk2.internal;
 
 import java.lang.annotation.Annotation;
+import org.glassfish.hk2.utilities.CleanerFactory;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.util.HashMap;
@@ -117,10 +119,14 @@ public void destroyOne(ActiveDescriptor<?> descriptor) {
     }
 
     private static class PerContextThreadWrapper {
-        private final HashMap<ActiveDescriptor<?>, Object> instances =
-                new HashMap<ActiveDescriptor<?>, Object>();
+
+        private final HashMap<ActiveDescriptor<?>, Object> instances = new HashMap<>();
         private final long id = Thread.currentThread().getId();
-
+
+        public PerContextThreadWrapper() {
+            registerStopEvent();
+        }
+
         public boolean has(ActiveDescriptor<?> d) {
             return instances.containsKey(d);
         }
@@ -133,13 +139,14 @@ public void put(ActiveDescriptor<?> d, Object v) {
             instances.put(d, v);
         }
 
-        @Override
-        public void finalize() throws Throwable {
-            instances.clear();
-
-            if (LOG_THREAD_DESTRUCTION) {
-                Logger.getLogger().debug("Removing PerThreadContext data for thread " + id);
-            }
+        public final void registerStopEvent() {
+            CleanerFactory.create().register(this, () -> {
+                instances.clear();
+
+                if (LOG_THREAD_DESTRUCTION) {
+                    Logger.getLogger().debug("Removing PerThreadContext data for thread " + id);
+                }
+            });
         }
 
     }

diff --git a/hk2-api/src/main/java/org/glassfish/hk2/utilities/CleanerFactory.java b/hk2-api/src/main/java/org/glassfish/hk2/utilities/CleanerFactory.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2023 Payara Foundation and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+package org.glassfish.hk2.utilities;
+
+import java.lang.ref.Cleaner;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.concurrent.ThreadFactory;
+
+/**
+ * CleanerFactory provides a Cleaner reference which is created on the first
+ * reference to the CleanerFactory.
+ */
+public final class CleanerFactory {
+
+    /* The common Cleaner. */
+    private final static Cleaner commonCleaner = Cleaner.create(new ThreadFactory() {
+        @Override
+        public Thread newThread(final Runnable r) {
+            return AccessController.doPrivileged(new PrivilegedAction<>() {
+                @Override
+                public Thread run() {
+                    Thread t = new Thread(null, r, "Common-Cleaner");
+                    t.setPriority(Thread.MAX_PRIORITY - 2);
+                    return t;
+                }
+            });
+        }
+    });
+
+
+    /**
+     * This Cleaner will run on a thread whose context class loader
+     * is {@code null}. The system cleaning action to perform in
+     * this Cleaner should handle a {@code null} context class loader.
+     *
+     * @return a common cleaner reference
+     */
+    public static Cleaner create() {
+        return commonCleaner;
+    }
+}
diff --git a/hk2-configuration/hk2-integration/pom.xml b/hk2-configuration/hk2-integration/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-configuration</artifactId>
-        <version>3.0.1.payara-p1</version>
+        <version>3.0.1.payara-p2</version>
     </parent>
 
     <artifactId>hk2-configuration-integration</artifactId>