Simplify cleaning

Author: labkey-jeckels

api/src/org/labkey/api/data/TempTableTracker.java

@@ -47,6 +47,8 @@ public class TempTableTracker
     private final String schemaName;
     private final String tableName;
     private final String qualifiedName;
+    private final Cleaner.Cleanable cleanable;
+    private final CleanupState state;
 
     private static class CleanupState implements Runnable
     {
@@ -78,15 +80,13 @@ public void run()
         }
     }
 
-    private final CleanupState state;
-
     private TempTableTracker(DbSchema schema, String tableName, Object ref)
     {
         this.schemaName = schema.getName();
         this.tableName = tableName;
         this.qualifiedName = this.schemaName + "." + this.tableName;
         this.state = new CleanupState(schema, tableName, qualifiedName, schemaName);
-        cleaner.register(ref, state);
+        cleanable = cleaner.register(ref, state);
     }
 
 
@@ -144,10 +144,9 @@ private static TempTableTracker track(TempTableTracker ttt)
 
     public synchronized void delete()
     {
-        state.run();
+        cleanable.clean();
     }
 
-
     private static void untrack(String qualifiedName, String schemaName, String tableName)
     {
         _log.debug("untrack(" + qualifiedName + ")");

api/src/org/labkey/api/util/CheckedInputStream.java

@@ -15,8 +15,9 @@
  */
 package org.labkey.api.util;
 
-import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.labkey.api.miniprofiler.MiniProfiler;
+import org.labkey.api.util.logging.LogHelper;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -27,10 +28,11 @@
  * User: adam
  * Date: 7/2/12
  */
-
 public class CheckedInputStream extends InputStreamWrapper
 {
     private static final Cleaner CLEANER = Cleaner.create();
+    public static final Logger LOG = LogHelper.getLogger(CheckedInputStream.class, "Utility to ensure InputStreams are closed");
+    private final State _state;
 
     private static class State implements Runnable
     {
@@ -49,36 +51,39 @@ public void run()
         {
             if (!_closed)
             {
-                LogManager.getLogger(CheckedInputStream.class).error("InputStream was not closed. Creation stacktrace:" + ExceptionUtil.renderStackTrace(_creationStackTrace));
-                try
-                {
-                    _is.close();
-                }
-                catch (IOException e)
-                {
-                    LogManager.getLogger(CheckedInputStream.class).error("Failed to close InputStream", e);
-                }
-                finally
-                {
-                    _closed = true;
-                }
+                LOG.error("InputStream was not closed. Creation stacktrace:" + ExceptionUtil.renderStackTrace(_creationStackTrace));
+                close();
             }
         }
-    }
 
-    private final Cleaner.Cleanable _cleanable;
+        private void close()
+        {
+            try
+            {
+                _is.close();
+            }
+            catch (IOException e)
+            {
+                LOG.error("Failed to close InputStream", e);
+            }
+            finally
+            {
+                _closed = true;
+            }
+        }
+    }
 
     public CheckedInputStream(InputStream is)
     {
         super(is);
         StackTraceElement[] creationStackTrace = MiniProfiler.getTroubleshootingStackTrace();
-        State state = new State(is, creationStackTrace);
-        _cleanable = CLEANER.register(this, state);
+        _state = new State(is, creationStackTrace);
+        CLEANER.register(this, _state);
     }
 
     @Override
     public void close() throws IOException
     {
-        _cleanable.clean();
+        _state.close();
     }
 }