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

[nextg...@freenetproject.org]

Author: nextgens
Date: 2007-11-29 12:41:43 +0000 (Thu, 29 Nov 2007)
New Revision: 16074

Modified:
   trunk/freenet/src/freenet/clients/http/filter/PNGFilter.java
Log:
PNGFilter: use the Closer

Modified: trunk/freenet/src/freenet/clients/http/filter/PNGFilter.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/filter/PNGFilter.java        
2007-11-29 12:39:54 UTC (rev 16073)
+++ trunk/freenet/src/freenet/clients/http/filter/PNGFilter.java        
2007-11-29 12:41:43 UTC (rev 16074)
@@ -14,6 +14,7 @@
 import freenet.support.HTMLNode;
 import freenet.support.api.Bucket;
 import freenet.support.api.BucketFactory;
+import freenet.support.io.Closer;

 /**
  * Content filter for PNG's.
@@ -27,10 +28,13 @@
        public Bucket readFilter(Bucket data, BucketFactory bf, String charset,
                        HashMap otherParams, FilterCallback cb) throws 
DataFilterException,
                        IOException {
-               InputStream is = data.getInputStream();
-               BufferedInputStream bis = new BufferedInputStream(is);
-               DataInputStream dis = new DataInputStream(bis);
+               InputStream is = null;
+               BufferedInputStream bis = null;
+               DataInputStream dis = null;
                try {
+                       is = data.getInputStream();
+                       dis = new DataInputStream(bis);
+                       dis = new DataInputStream(bis);
                        // Check the header
                        byte[] headerCheck = new byte[pngHeader.length];
                        dis.read(headerCheck);
@@ -42,7 +46,9 @@
                                                "<p>"+message+"</p>", new 
HTMLNode("p").addChild("#", message));
                        }
                } finally {
-                       dis.close();
+                       Closer.close(dis);
+                       Closer.close(bis);
+                       Closer.close(is);
                }
                return data;
        }