[freenet-cvs] r12641 - trunk/freenet/src/freenet/node/fcp

[nextg...@freenetproject.org]

Author: nextgens
Date: 2007-04-13 16:35:50 +0000 (Fri, 13 Apr 2007)
New Revision: 12641

Modified:
   trunk/freenet/src/freenet/node/fcp/TestDDACompleteMessage.java
Log:
Improve TestDDACompleteMessage, reading the file using InputStreamReader

Modified: trunk/freenet/src/freenet/node/fcp/TestDDACompleteMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/TestDDACompleteMessage.java      
2007-04-13 16:34:02 UTC (rev 12640)
+++ trunk/freenet/src/freenet/node/fcp/TestDDACompleteMessage.java      
2007-04-13 16:35:50 UTC (rev 12641)
@@ -7,6 +7,7 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.InputStreamReader;

 import freenet.node.Node;
 import freenet.node.fcp.FCPConnectionHandler.DDACheckJob;
@@ -58,14 +59,16 @@
                                try {
                                        FileInputStream fis = new 
FileInputStream(maybeWrittenFile);
                                        BufferedInputStream bis = new 
BufferedInputStream(fis);
+                                       InputStreamReader isr = new 
InputStreamReader(bis);
                                        StringBuffer sb = new StringBuffer();
-
-                                       int current = bis.read(); 
-                                       while(current != -1) {
-                                               sb.append((char)current);
-                                               current = bis.read();
+                                       
+                                       char[] buf = new char[1024];
+                                       
+                                       while(isr.ready()) {
+                                               isr.read(buf);
+                                               sb.append(buf);
                                        }
-                                       
+                                       isr.close();
                                        bis.close();
                                        fis.close();
                                        isWriteAllowed = 
checkJob.writeContent.equals(sb.toString().trim());