Skip to content

Eliminate finalize() overrides #976

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-jeckels merged 3 commits into from
Jan 8, 2026
Merged

Eliminate finalize() overrides #976

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ce690f2
Eliminate finalize() overrides
labkey-jeckels Jan 3, 2026
dc54b59
Close the stream
labkey-jeckels Jan 6, 2026
45acc14
Revert "Close the stream"
labkey-jeckels Jan 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 4 additions & 17 deletions ms2/src/org/labkey/ms2/SpectrumImporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -262,10 +262,7 @@ private void importSpectra()
_systemLog.error(e);
}

if (null != conn)
{
schema.getScope().releaseConnection(conn);
}
schema.getScope().releaseConnection(conn);
}
}

Expand All @@ -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;
Expand Down
11 changes: 1 addition & 10 deletions ms2/src/org/labkey/ms2/reader/TarIterator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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)
Expand Down