[freenet-cvs] r17730 - trunk/freenet/src/freenet/clients/http/filter

[nextgens at freenetproject.org]

Author: nextgens
Date: 2008-02-09 00:59:11 +0000 (Sat, 09 Feb 2008)
New Revision: 17730

Modified:
   trunk/freenet/src/freenet/clients/http/filter/JPEGFilter.java
   trunk/freenet/src/freenet/clients/http/filter/PNGFilter.java
Log:
PNGFilter: Fix the bug in the JPEG filter too

Modified: trunk/freenet/src/freenet/clients/http/filter/JPEGFilter.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/filter/JPEGFilter.java	2008-02-09 00:57:07 UTC (rev 17729)
+++ trunk/freenet/src/freenet/clients/http/filter/JPEGFilter.java	2008-02-09 00:59:11 UTC (rev 17730)
@@ -74,6 +74,7 @@
 			readFilter(data, bf, charset, otherParams, cb, deleteComments, deleteExif, os);
 			os.flush();
 			os.close();
+			os = null;
 		} finally {
 			Closer.close(os);
 		}
@@ -307,7 +308,6 @@
 			// FIXME
 		} finally {
 			Closer.close(dis);
-			Closer.close(output);
 		}
 		return data;
 	}

Modified: trunk/freenet/src/freenet/clients/http/filter/PNGFilter.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/filter/PNGFilter.java	2008-02-09 00:57:07 UTC (rev 17729)
+++ trunk/freenet/src/freenet/clients/http/filter/PNGFilter.java	2008-02-09 00:59:11 UTC (rev 17730)
@@ -67,6 +67,8 @@
 		try {
 			readFilter(data, bf, charset, otherParams, cb, deleteText, deleteTimestamp, checkCRCs, os);
 			os.flush();
+			os.close();
+			os = null;
 		} finally {
 			Closer.close(os);
 		}