mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-08-29 16:47:56 +00:00
Code Issues Releases Wiki Activity

Don't close file handles from ResourceMounts

Browse Source 
Unlike short handles, we don't read these immediately, and so we can't
close it right away. Otherwise the file is considered empty!

Fixes SquidDev-CC/treasure-programs#1
This commit is contained in:
Jonathan Coates
2021-05-05 21:26:17 +01:00
committed by Jummit
parent 4a20eea852
commit f0d7a1165d
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/dan200/computercraft/core/filesystem/ResourceMount.java
View File

@@ -31,7 +31,7 @@ import com.google.common.io.ByteStreams;
import dan200.computercraft.ComputerCraft;
import dan200.computercraft.api.filesystem.IMount;
import dan200.computercraft.core.apis.handles.ArrayByteChannel;
import dan200.computercraft.shared.util.IoUtil;
import net.minecraft.resource.ReloadableResourceManager;
import net.minecraft.resource.Resource;
import net.minecraft.resource.ResourceManager;
@@ -186,13 +186,19 @@ public final class ResourceMount implements IMount {
return new ArrayByteChannel(contents);
}
try (InputStream stream = this.manager.getResource(file.identifier)
.getInputStream()) {
if (stream.available() > MAX_CACHED_SIZE) {
return Channels.newChannel(stream);
}
try
{
InputStream stream = manager.getResource( file.identifier ).getInputStream();
if( stream.available() > MAX_CACHED_SIZE ) return Channels.newChannel( stream );
contents = ByteStreams.toByteArray(stream);
try
{
contents = ByteStreams.toByteArray( stream );
}
finally
{
IoUtil.closeQuietly( stream );
}
CONTENTS_CACHE.put(file, contents);
return new ArrayByteChannel(contents);
} catch (FileNotFoundException ignored) {