wisplite/distant-horizons-core-sharded
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix resource leaks from missing close() on stream (Thx Boston!!!!!)

Browse Source
This commit is contained in:
tom lee
2022-02-20 01:00:32 +08:00
parent a1652fe68a
commit 401cbbd8eb
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/seibel/lod/core/handlers/LodDimensionFileHandler.java
+12 -4
View File
@@ -257,13 +257,17 @@ public class LodDimensionFileHandler
+ ". File will be loaded and updated to new format in next save.");
// this is old, but readable version
// read and add the data to our region
region.addLevelContainer(new VerticalLevelContainer(new DataInputStream(inputStream), fileVersion, tempDetailLevel));
DataInputStream dataStream = new DataInputStream(inputStream);
region.addLevelContainer(new VerticalLevelContainer(dataStream, fileVersion, tempDetailLevel));
dataStream.close();
inputStream.close();
} else
{
// this file is a readable version,
// read and add the data to our region
region.addLevelContainer(new VerticalLevelContainer(new DataInputStream(inputStream), LOD_SAVE_FILE_VERSION, tempDetailLevel));
DataInputStream dataStream = new DataInputStream(inputStream);
region.addLevelContainer(new VerticalLevelContainer(dataStream, LOD_SAVE_FILE_VERSION, tempDetailLevel));
dataStream.close();
inputStream.close();
}
}
@@ -306,7 +310,9 @@ public class LodDimensionFileHandler
// add the version of this file
outputStream.write(LOD_SAVE_FILE_VERSION);
// add each LodChunk to the file
dataContainer.writeData(new DataOutputStream(outputStream));
DataOutputStream dataStream = new DataOutputStream(outputStream);
dataContainer.writeData(dataStream);
dataStream.close();
outputStream.close();
}
catch (IOException e)
@@ -532,7 +538,9 @@ public class LodDimensionFileHandler
// add the version of this file
outputStream.write(LOD_SAVE_FILE_VERSION);
// add each LodChunk to the file
boolean isNewDataFullyGened = region.getLevel(detailLevel).writeData(new DataOutputStream(outputStream));
DataOutputStream dataStream = new DataOutputStream(outputStream);
boolean isNewDataFullyGened = region.getLevel(detailLevel).writeData(dataStream);
dataStream.close();
outputStream.close();
if (!isNewDataFullyGened && isFileFullyGened)