Fix #3596 Close jar sources safely in Java 6 (#3597)

This commit is contained in:
James Mitchell authored and LexManos committed 2017-01-11 15:18:33 -08:00
1 parent c545b8ecd4
commit 941c3eff02
4 files changed
+55 -4

No files matched your search

@@ -20,7 +20,6 @@
package net.minecraftforge.fml.common.asm;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.net.URLDecoder;
import java.security.CodeSource;
@@ -29,6 +28,7 @@ import java.util.Map;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
import net.minecraftforge.common.util.Java6Utils;
import org.apache.commons.io.IOUtils;
import org.apache.logging.log4j.Level;
@@ -146,7 +146,7 @@ public class FMLSanityChecker implements IFMLCallHook
}
finally
{
IOUtils.closeQuietly(mcJarFile);
Java6Utils.closeZipQuietly(mcJarFile);
}
}
else
@@ -24,6 +24,7 @@ import java.util.Collections;
import java.util.List;
import java.util.jar.JarFile;
import net.minecraftforge.common.util.Java6Utils;
import net.minecraftforge.fml.common.FMLLog;
import net.minecraftforge.fml.common.LoaderException;
import net.minecraftforge.fml.common.MetadataCollection;
@@ -119,7 +120,7 @@ public class JarDiscoverer implements ITypeDiscoverer
}
finally
{
IOUtils.closeQuietly(jar);
Java6Utils.closeZipQuietly(jar);
}
return foundMods;
}
@@ -36,6 +36,7 @@ import net.minecraft.util.IThreadListener;
import net.minecraft.util.text.translation.LanguageMap;
import net.minecraft.world.storage.SaveFormatOld;
import net.minecraftforge.common.util.CompoundDataFixer;
import net.minecraftforge.common.util.Java6Utils;
import net.minecraftforge.fml.common.FMLCommonHandler;
import net.minecraftforge.fml.common.FMLLog;
import net.minecraftforge.fml.common.IFMLSidedHandler;
@@ -260,7 +261,7 @@ public class FMLServerHandler implements IFMLSidedHandler
finally
{
IOUtils.closeQuietly(stream);
IOUtils.closeQuietly(zip);
Java6Utils.closeZipQuietly(zip);
}
}