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

[nextg...@freenetproject.org]

Author: nextgens
Date: 2007-11-29 12:39:54 +0000 (Thu, 29 Nov 2007)
New Revision: 16073

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

Modified: trunk/freenet/src/freenet/clients/http/filter/JPEGFilter.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/filter/JPEGFilter.java       
2007-11-29 12:37:30 UTC (rev 16072)
+++ trunk/freenet/src/freenet/clients/http/filter/JPEGFilter.java       
2007-11-29 12:39:54 UTC (rev 16073)
@@ -20,6 +20,7 @@
 import freenet.support.Logger;
 import freenet.support.api.Bucket;
 import freenet.support.api.BucketFactory;
+import freenet.support.io.Closer;
 import freenet.support.io.CountedInputStream;

 /**
@@ -69,8 +70,12 @@
                        Logger.minor(this, "Need to modify JPEG...");
                Bucket filtered = bf.makeBucket(data.size());
                OutputStream os = new 
BufferedOutputStream(filtered.getOutputStream());
-               Bucket ret = readFilter(data, bf, charset, otherParams, cb, 
deleteComments, deleteExif, os);
-               os.close();
+               Bucket ret = null;
+               try {
+                       ret = readFilter(data, bf, charset, otherParams, cb, 
deleteComments, deleteExif, os);
+               } finally {
+                       Closer.close(os);
+               }
                return ret;
        }

@@ -294,8 +299,8 @@
                        // In particular, we may want to delete, or filter, the 
comment blocks.
                        // FIXME
                } finally {
-                       dis.close();
-                       if(output != null) output.close();
+                       Closer.close(dis);
+                       Closer.close(output);
                }
                return data;
        }