Skip to content

fix: Compression-Stream not being closed, not releasing resources #167

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
granny merged 1 commit into from
Sep 21, 2026
+14 −4
Merged

fix: Compression-Stream not being closed, not releasing resources #167

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 14 additions & 4 deletions core/src/main/java/net/pl3x/map/core/world/ChunkLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import de.bluecolored.bluenbt.TypeToken;
import java.io.BufferedInputStream;
import java.io.FileInputStream;
import java.io.FilterInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.RandomAccessFile;
Expand Down Expand Up @@ -81,15 +82,17 @@ public Chunk load(RandomAccessFile raf, long offset, int index) throws IOExcepti
// optimistic: try last used version
ChunkVersionLoader<?> usedLoader = lastUsedLoader;
Chunk chunk;
InputStream decompressedIn = new BufferedInputStream(compression.decompress(new FileInputStream(raf.getFD())));
chunk = usedLoader.load(world, region, decompressedIn, index);
try (InputStream decompressedIn = new BufferedInputStream(compression.decompress(nonClosing(new FileInputStream(raf.getFD()))))) {
chunk = usedLoader.load(world, region, decompressedIn, index);
}

// check version and reload chunk if the wrong loader has been used and a better one has been found
ChunkVersionLoader<?> actualLoader = findBestLoaderForVersion(chunk.getDataVersion());
if (actualLoader != null && usedLoader != actualLoader) {
raf.seek(offset + 5);
decompressedIn = new BufferedInputStream(compression.decompress(new FileInputStream(raf.getFD())));
chunk = actualLoader.load(world, region, decompressedIn, index);
try (InputStream decompressedIn = new BufferedInputStream(compression.decompress(nonClosing(new FileInputStream(raf.getFD()))))) {
chunk = actualLoader.load(world, region, decompressedIn, index);
}
lastUsedLoader = actualLoader;
}

Expand All @@ -103,6 +106,13 @@ public Chunk load(RandomAccessFile raf, long offset, int index) throws IOExcepti
return null;
}

private static InputStream nonClosing(InputStream in) {
return new FilterInputStream(in) {
@Override
public void close() {}
};
}

private static class ChunkVersionLoader<D extends Chunk.Data> {

private final Class<D> dataType;
Expand Down
Loading