[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3518] trunk/LWJGL/src/java/org/lwjgl/util/applet /AppletLoader.java

[<ka...@us...>]

Revision: 3518
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3518&view=rev
Author:   kappa1
Date:     2011-04-26 11:04:12 +0000 (Tue, 26 Apr 2011)

Log Message:
-----------
AppletLoader: close fileoutputstream properly when extracting pack files. Minor clean up of extract lzma and gzip methods.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java

Modified: trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2011-04-16 21:13:27 UTC (rev 3517)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2011-04-26 11:04:12 UTC (rev 3518)
@@ -1385,8 +1385,7 @@
 		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 @@
 		inputHandle.close();
 		outputHandle.close();
 
-		outputHandle = null;
-		inputHandle = null;
-
 		// delete LZMA file, as it is no longer needed
 		f.delete();
 	}
@@ -1419,8 +1415,7 @@
 
 		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 @@
 		inputHandle.close();
 		outputHandle.close();
 
-		outputHandle = null;
-		inputHandle = null;
-
 		// delete GZip file, as it is no longer needed
 		f.delete();
 	}
@@ -1454,6 +1446,7 @@
 	    Pack200.Unpacker unpacker = Pack200.newUnpacker();
 	    unpacker.unpack(f, jostream);
 	    jostream.close();
+	    fostream.close();
 
 	    // delete pack file as its no longer needed
 	    f.delete();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.