[Gzz-commits] storm/org/nongnu/storm BlockId.java BlockId.tes...

[Benja Fallenstein]

CVSROOT:        /cvsroot/storm
Module name:    storm
Changes by:     Benja Fallenstein <address@hidden>      03/05/24 08:19:41

Modified files:
        org/nongnu/storm: BlockId.java BlockId.test 
        org/nongnu/storm/util: HTTPProxy.java 

Log message:
        find, test and fix mudyc's bug-- it was in 
BlockId.getCheckedInputStream()

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/org/nongnu/storm/BlockId.java.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/org/nongnu/storm/BlockId.test.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/org/nongnu/storm/util/HTTPProxy.java.diff?tr1=1.39&tr2=1.40&r1=text&r2=text

Patches:
Index: storm/org/nongnu/storm/BlockId.java
diff -u storm/org/nongnu/storm/BlockId.java:1.18 
storm/org/nongnu/storm/BlockId.java:1.19
--- storm/org/nongnu/storm/BlockId.java:1.18    Tue May 13 09:44:19 2003
+++ storm/org/nongnu/storm/BlockId.java Sat May 24 08:19:40 2003
@@ -127,7 +127,7 @@
                public void close() throws IOException {
                    /** Read all that hasn't been read yet.
                     */
-                   while(read() > 0);
+                   while(read() >= 0);
 
                    super.close();
                    byte[] dig; 
Index: storm/org/nongnu/storm/BlockId.test
diff -u storm/org/nongnu/storm/BlockId.test:1.12 
storm/org/nongnu/storm/BlockId.test:1.13
--- storm/org/nongnu/storm/BlockId.test:1.12    Fri Apr 25 09:00:14 2003
+++ storm/org/nongnu/storm/BlockId.test Sat May 24 08:19:40 2003
@@ -20,7 +20,7 @@
 # 
 # 
 
-import java, com
+import java, com, org
 from org.nongnu.storm import BlockId
 from jarray import array
 
@@ -233,3 +233,16 @@
     
     assert check3(id_3, data_3)
     assert (not check3(id_1, data_3)) and (not check3(id_2, data_3))
+
+
+def testCheckNullBytes():
+    pool = org.nongnu.storm.impl.TransientPool(java.util.HashSet())
+    s = pool.getBlockOutputStream("application/octet-stream")
+    s.write(0); s.write(0)
+    s.close()
+
+    id = s.getBlockId()
+
+    b = java.io.ByteArrayInputStream(array([0,0], 'b'))
+    c = id.getCheckedInputStream(b)
+    c.close();
Index: storm/org/nongnu/storm/util/HTTPProxy.java
diff -u storm/org/nongnu/storm/util/HTTPProxy.java:1.39 
storm/org/nongnu/storm/util/HTTPProxy.java:1.40
--- storm/org/nongnu/storm/util/HTTPProxy.java:1.39     Thu May 22 19:17:29 2003
+++ storm/org/nongnu/storm/util/HTTPProxy.java  Sat May 24 08:19:41 2003
@@ -243,7 +243,7 @@
                         if(rewrite) 
                             s = base + s;
                        if(n != null) {
-                           w.write("<b><a href=\""+s+"\">"+n+"</a></b>\n");
+                           w.write("\"<b><a href=\""+s+"\">"+n+"</a></b>\"\n");
                            w.write("<small>("+id+")</small><br />\n");
                        } else {
                            w.write("<a href=\""+s+"\">"+id+"</a><br />\n");