[Gzz-commits] storm ./test.py org/nongnu/storm/BlockId.java o...

[Benja Fallenstein]

CVSROOT:        /cvsroot/storm
Module name:    storm
Changes by:     Benja Fallenstein <address@hidden>      03/04/22 09:01:22

Modified files:
        .              : test.py 
        org/nongnu/storm: BlockId.java BlockId.test 
        org/nongnu/storm/impl: AsyncSetCollector.java 

Log message:
        fixes

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/test.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/org/nongnu/storm/BlockId.java.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/org/nongnu/storm/BlockId.test.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/org/nongnu/storm/impl/AsyncSetCollector.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text

Patches:
Index: storm/org/nongnu/storm/BlockId.java
diff -u storm/org/nongnu/storm/BlockId.java:1.11 
storm/org/nongnu/storm/BlockId.java:1.12
--- storm/org/nongnu/storm/BlockId.java:1.11    Mon Apr 21 17:07:41 2003
+++ storm/org/nongnu/storm/BlockId.java Tue Apr 22 09:01:21 2003
@@ -53,13 +53,13 @@
         int dot = uri.lastIndexOf('.');
        int comma = uri.lastIndexOf(',');
 
-       checkContentType(uri);
+       contentType = uri.substring(PREFIX_LEN, comma);
+       checkContentType(contentType);
 
        if(!uri.startsWith(PREFIX) || dot < 0 || 
           comma < 0 || dot < comma)
            throw new IllegalArgumentException("Bad block URN: "+uri);
 
-       contentType = uri.substring(PREFIX_LEN, comma);
        sha1 = Base32.decode(uri.substring(comma+1, dot));
        tigertree = Base32.decode(uri.substring(dot+1));
     }
@@ -164,6 +164,8 @@
 
 
     private void checkContentType(String s) {
+       if(s.equals("")) return;
+       
        s = s.toLowerCase();
        int slash = s.indexOf('/');
        if(s.substring(slash+1, slash+3).equals("x-") ||
Index: storm/org/nongnu/storm/BlockId.test
diff -u storm/org/nongnu/storm/BlockId.test:1.8 
storm/org/nongnu/storm/BlockId.test:1.9
--- storm/org/nongnu/storm/BlockId.test:1.8     Mon Apr 21 17:07:41 2003
+++ storm/org/nongnu/storm/BlockId.test Tue Apr 22 09:01:21 2003
@@ -115,6 +115,20 @@
     except java.lang.IllegalArgumentException: pass
     else: assert 0
 
+def testNoContentType():
+    """Test that content type can be empty"""
+
+    BlockId("urn:x-storm:1.0:,"
+            "UUHHSQPHQXN5X6EMYK6CD7IJ7BHZTE77."
+            "PZMRYHGY6LTBEH63ZWAHDORHSYTLO4LEFUIKHWY")
+
+    sha1 = com.bitzi.util.Base32.decode(
+        "u7uu5zpmkoeykkwhxd4unlqycc36gvl7")
+    tiger = com.bitzi.util.Base32.decode(
+        "jtlcbiy2r6gfsznbgj42yzqbqk4ti373bqs5qyy")
+    BlockId("", sha1, tiger)
+
+
 def testGetIdForData():
     id_1 = BlockId(uri_1)
     id_2 = BlockId(uri_2)
Index: storm/org/nongnu/storm/impl/AsyncSetCollector.java
diff -u storm/org/nongnu/storm/impl/AsyncSetCollector.java:1.5 
storm/org/nongnu/storm/impl/AsyncSetCollector.java:1.6
--- storm/org/nongnu/storm/impl/AsyncSetCollector.java:1.5      Mon Apr 21 
17:07:41 2003
+++ storm/org/nongnu/storm/impl/AsyncSetCollector.java  Tue Apr 22 09:01:21 2003
@@ -152,9 +152,11 @@
                public boolean hasNext() {
                    if(!queue.isEmpty())
                        return true;
-                   try {
-                       queue.wait();
-                   } catch(InterruptedException e) {}
+                   synchronized(queue) {
+                       try {
+                           queue.wait();
+                       } catch(InterruptedException e) {}
+                   }
                    return !queue.isEmpty();
                }
                public Object next() {
Index: storm/test.py
diff -u storm/test.py:1.3 storm/test.py:1.4
--- storm/test.py:1.3   Mon Apr 21 17:07:40 2003
+++ storm/test.py       Tue Apr 22 09:01:21 2003
@@ -170,8 +170,8 @@
     if exceptions:
         print "Java stack traces:"
         for name, exc in exceptions:
-            print name
             print 75 * '-'
+            print name
             exc['exception'][1].printStackTrace()
             
         print 75 * '-'