[freenet-cvs] r21952 - in trunk/freenet: src/freenet/clients/http/filter test/freenet/clients/http/filter

[nextg...@freenetproject.org]

Author: nextgens
Date: 2008-08-17 10:36:48 +0000 (Sun, 17 Aug 2008)
New Revision: 21952

Modified:
   trunk/freenet/src/freenet/clients/http/filter/HTMLFilter.java
   trunk/freenet/test/freenet/clients/http/filter/ContentFilterTest.java
Log:
doh! Fix the content filter and its test

Modified: trunk/freenet/src/freenet/clients/http/filter/HTMLFilter.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/filter/HTMLFilter.java       
2008-08-17 10:27:31 UTC (rev 21951)
+++ trunk/freenet/src/freenet/clients/http/filter/HTMLFilter.java       
2008-08-17 10:36:48 UTC (rev 21952)
@@ -49,7 +49,7 @@
                if(logMINOR) Logger.minor(this, "readFilter(): 
charset="+charset);
                InputStream strm = bucket.getInputStream();
                BufferedInputStream bis = new BufferedInputStream(strm, 4096);
-               Bucket temp = bf.makeBucket(bucket.size());
+               Bucket temp = bf.makeBucket(-1);
                OutputStream os = temp.getOutputStream();
                BufferedOutputStream bos = new BufferedOutputStream(os, 4096);
                Reader r = null;

Modified: trunk/freenet/test/freenet/clients/http/filter/ContentFilterTest.java
===================================================================
--- trunk/freenet/test/freenet/clients/http/filter/ContentFilterTest.java       
2008-08-17 10:27:31 UTC (rev 21951)
+++ trunk/freenet/test/freenet/clients/http/filter/ContentFilterTest.java       
2008-08-17 10:36:48 UTC (rev 21952)
@@ -62,7 +62,8 @@
        private String HTMLFilter(String data) throws Exception {
                String typeName = "text/html";
                URI baseURI = new URI(BASE_URI);
+               byte[] dataToFilter = data.getBytes("UTF-8");

-               return ContentFilter.filter(new 
ArrayBucket(data.getBytes("UTF-8")), bf, typeName, baseURI, 
null).data.toString();
+               return ContentFilter.filter(new ArrayBucket(dataToFilter, -1), 
bf, typeName, baseURI, null).data.toString();
        }
 }