Eliminate finalize() overrides (#976)

Author: labkey-jeckels

ms2/src/org/labkey/ms2/SpectrumImporter.java

@@ -46,9 +46,9 @@ public class SpectrumImporter
     private static final Logger _systemLog = LogManager.getLogger(SpectrumImporter.class);
     private static final int SQL_BATCH_SIZE = 100;
 
-    private Logger _log;
-    private MS2Importer.MS2Progress _progress;
-    private Set<Integer> _scans;
+    private final Logger _log;
+    private final MS2Importer.MS2Progress _progress;
+    private final Set<Integer> _scans;
     private final int _fractionId;
     private SimpleScanIterator _scanIterator;
     private FileLike _file = null;
@@ -262,10 +262,7 @@ private void importSpectra()
                 _systemLog.error(e);
             }
 
-            if (null != conn)
-            {
-                schema.getScope().releaseConnection(conn);
-            }
+            schema.getScope().releaseConnection(conn);
         }
     }
 
@@ -278,16 +275,6 @@ private void close()
         _scanIterator = null;
     }
 
-
-    @Override
-    protected void finalize() throws Throwable
-    {
-        super.finalize();
-
-        assert null == _scanIterator;
-    }
-
-
     public FileLike getFile()
     {
         return _file;

ms2/src/org/labkey/ms2/reader/TarIterator.java

@@ -42,7 +42,7 @@ public class TarIterator implements SimpleScanIterator
     private static final Logger _log = LogManager.getLogger(TarIterator.class);
     private static final int STREAM_BUFFER_SIZE = 128 * 1024;
 
-    private String _dtaFileNamePrefix;
+    private final String _dtaFileNamePrefix;
     private InputStream _is;
     private GZIPInputStream _gzInputStream;
     private TarArchiveInputStream _tis;
@@ -165,15 +165,6 @@ public void close()
         }
     }
 
-    @Override
-    protected void finalize() throws Throwable
-    {
-        super.finalize();
-
-        assert null == _is && null == _gzInputStream && null == _tis;
-    }
-
-
     private static byte[] realloc(int size, byte[] buf)
     {
         if (null == buf || buf.length < size)