Make MasterCleaner private

Author: pmconrad

src/com/sun/jna/internal/Cleaner.java

@@ -56,8 +56,8 @@ public class Cleaner {
      * 1. If a long-lived thread registers some objects in the beginning, but
      *    then stops registering more objects, the previously registered
      *    objects will never be cleared.
-     * 2. When a thread exists before all its registered objects have been
-     *    cleared, the ThreadLocal instance are lost, and so are the pending
+     * 2. When a thread exits before all its registered objects have been
+     *    cleared, the ThreadLocal instance is lost, and so are the pending
      *    objects.
      *
      * The Master Cleaner handles the first issue by regularly handling the
@@ -66,6 +66,9 @@ public class Cleaner {
      * instances with the Master's reference queue.
      */
 
+    public static final long MASTER_CLEANUP_INTERVAL_MS = 5000;
+    public static final long MASTER_MAX_LINGER_MS = 30000;
+
     private static class CleanerImpl {
         protected final ReferenceQueue<Object> referenceQueue = new ReferenceQueue<Object>();
         protected final Map<Long,CleanerRef> cleanables = new ConcurrentHashMap<Long,CleanerRef>();
@@ -118,10 +121,7 @@ protected synchronized boolean remove(long n) {
         }
     }
 
-    public static class MasterCleaner extends Cleaner {
-        public static final long CLEANUP_INTERVAL_MS = 5000;
-        public static final long MAX_LINGER_MS = 30000;
-
+    private static class MasterCleaner extends Cleaner {
         private static MasterCleaner INSTANCE;
 
         public static synchronized void add(Cleaner cleaner) {
@@ -155,10 +155,10 @@ private MasterCleaner() {
                 @Override
                 public void run() {
                     long now;
-                    while ((now = System.currentTimeMillis()) < lastNonEmpty + MAX_LINGER_MS || !deleteIfEmpty()) {
+                    while ((now = System.currentTimeMillis()) < lastNonEmpty + MASTER_MAX_LINGER_MS || !deleteIfEmpty()) {
                         if (!cleanerImpls.isEmpty()) { lastNonEmpty = now; }
                         try {
-                            Reference<?> ref = impl.referenceQueue.remove(CLEANUP_INTERVAL_MS);
+                            Reference<?> ref = impl.referenceQueue.remove(MASTER_CLEANUP_INTERVAL_MS);
                             if(ref instanceof CleanerRef) {
                                 ((CleanerRef) ref).clean();
                             } else {

test/com/sun/jna/CallbacksTest.java

@@ -363,7 +363,7 @@ public void callback() {
 
         cb = null;
         System.gc();
-        for (int i = 0; i < Cleaner.MasterCleaner.CLEANUP_INTERVAL_MS / 10 + 5 && (ref.get() != null || refs.containsValue(ref)); ++i) {
+        for (int i = 0; i < Cleaner.MASTER_CLEANUP_INTERVAL_MS / 10 + 5 && (ref.get() != null || refs.containsValue(ref)); ++i) {
             Thread.sleep(10); // Give the GC a chance to run
             System.gc();
         }
@@ -372,11 +372,11 @@ public void callback() {
 
         ref = null;
         System.gc();
-        for (int i = 0; i < Cleaner.MasterCleaner.CLEANUP_INTERVAL_MS / 10 + 5 && (cbstruct.peer != 0 || refs.size() > 0); ++i) {
+        for (int i = 0; i < Cleaner.MASTER_CLEANUP_INTERVAL_MS / 10 + 5 && (cbstruct.peer != 0 || refs.size() > 0); ++i) {
             // Flush weak hash map
             refs.size();
             try {
-                Thread.sleep(Cleaner.MasterCleaner.CLEANUP_INTERVAL_MS + 10); // Give the GC a chance to run
+                Thread.sleep(Cleaner.MASTER_CLEANUP_INTERVAL_MS + 10); // Give the GC a chance to run
                 System.gc();
             } finally {}
         }