Improve the ThreadGroup of the Janitor

corretto · Feb 26, 2020 · 5e9cfc5 · 5e9cfc5
1 parent ba5f420
commit 5e9cfc5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Maintenance
 * Add timestamping to signed jars.
+* Create the `Janitor` in the `Loader` so that it gets a more logical and consistent `ThreadGroup`.
 
 ## 1.3.0
 

diff --git a/src/com/amazon/corretto/crypto/provider/Loader.java b/src/com/amazon/corretto/crypto/provider/Loader.java
@@ -165,11 +165,16 @@ static String getProperty(String propertyName, String def) {
         } else {
             LOG.log(Level.CONFIG, "Unable to load native library", error);
         }
+
+        // Finally start up a cleaning thread if necessary
+        RESOURCE_JANITOR = new Janitor();
     }
 
     static final boolean IS_AVAILABLE;
     static final Throwable LOADING_ERROR;
 
+    static final Janitor RESOURCE_JANITOR;
+
     static void load() {
         // no-op - but we run the static block as a side effect
     }

diff --git a/src/com/amazon/corretto/crypto/provider/NativeResource.java b/src/com/amazon/corretto/crypto/provider/NativeResource.java
@@ -3,13 +3,13 @@
 
 package com.amazon.corretto.crypto.provider;
 
+import static com.amazon.corretto.crypto.provider.Loader.RESOURCE_JANITOR;
+
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.function.LongConsumer;
 import java.util.function.LongFunction;
 
 class NativeResource {
-    private static final Janitor RESOURCE_JANITOR = new Janitor();
-
     /**
      * For tests. Makes a best-effort attempt to awaken any sleeping cleaner threads.
      */