From d100475d959c9137508019e12801c26cb5a11612 Mon Sep 17 00:00:00 2001 From: kappa1 Date: Tue, 26 Apr 2011 11:04:12 +0000 Subject: [PATCH] AppletLoader: close fileoutputstream properly when extracting pack files. Minor clean up of extract lzma and gzip methods. --- src/java/org/lwjgl/util/applet/AppletLoader.java | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/java/org/lwjgl/util/applet/AppletLoader.java b/src/java/org/lwjgl/util/applet/AppletLoader.java index 126ddb6f..c8d229ea 100644 --- a/src/java/org/lwjgl/util/applet/AppletLoader.java +++ b/src/java/org/lwjgl/util/applet/AppletLoader.java @@ -1385,8 +1385,7 @@ public class AppletLoader extends Applet implements Runnable, AppletStub { Constructor constructor = clazz.getDeclaredConstructor(InputStream.class); InputStream inputHandle = (InputStream) constructor.newInstance(fileInputHandle); - OutputStream outputHandle; - outputHandle = new FileOutputStream(out); + OutputStream outputHandle = new FileOutputStream(out); byte [] buffer = new byte [1<<14]; @@ -1399,9 +1398,6 @@ public class AppletLoader extends Applet implements Runnable, AppletStub { inputHandle.close(); outputHandle.close(); - outputHandle = null; - inputHandle = null; - // delete LZMA file, as it is no longer needed f.delete(); } @@ -1419,8 +1415,7 @@ public class AppletLoader extends Applet implements Runnable, AppletStub { InputStream inputHandle = new GZIPInputStream(fileInputHandle); - OutputStream outputHandle; - outputHandle = new FileOutputStream(out); + OutputStream outputHandle = new FileOutputStream(out); byte [] buffer = new byte [1<<14]; @@ -1433,9 +1428,6 @@ public class AppletLoader extends Applet implements Runnable, AppletStub { inputHandle.close(); outputHandle.close(); - outputHandle = null; - inputHandle = null; - // delete GZip file, as it is no longer needed f.delete(); } @@ -1454,6 +1446,7 @@ public class AppletLoader extends Applet implements Runnable, AppletStub { Pack200.Unpacker unpacker = Pack200.newUnpacker(); unpacker.unpack(f, jostream); jostream.close(); + fostream.close(); // delete pack file as its no longer needed f.delete();