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

[nextg...@freenetproject.org]

Author: nextgens
Date: 2007-11-29 18:40:17 +0000 (Thu, 29 Nov 2007)
New Revision: 16094

Modified:
   trunk/freenet/src/freenet/clients/http/filter/CSSReadFilter.java
Log:
Fix yetAnotherBug I have introduced in the CSSReadFilter

Modified: trunk/freenet/src/freenet/clients/http/filter/CSSReadFilter.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/filter/CSSReadFilter.java    
2007-11-29 17:28:09 UTC (rev 16093)
+++ trunk/freenet/src/freenet/clients/http/filter/CSSReadFilter.java    
2007-11-29 18:40:17 UTC (rev 16094)
@@ -41,26 +41,27 @@
                Reader r = null;
                Writer w = null;
                InputStreamReader isr = null;
-               OutputStreamWriter osr = null;
+               OutputStreamWriter osw = null;
                try {
                        try {
                                isr = new InputStreamReader(strm, charset);
-                               osr = new OutputStreamWriter(os, charset);
+                               osw = new OutputStreamWriter(os, charset);
                                r = new BufferedReader(isr, 32768);
-                               w = new BufferedWriter(osr, 32768);
+                               w = new BufferedWriter(osw, 32768);
                        } catch(UnsupportedEncodingException e) {
+                               Closer.close(osw);
+                               Closer.close(os);
                                throw UnknownCharsetException.create(e, 
charset);
                        }
                        CSSParser parser = new CSSParser(r, w, false, cb);
                        parser.parse();
                }
                finally {
+                       // Do *not* close output related things here!
+                       Closer.close(strm);
                        Closer.close(isr);
                        Closer.close(r);
-                       Closer.close(osr);
                        Closer.close(w);
-                       Closer.close(os);
-                       Closer.close(strm);
                }
                return temp;
        }