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

[Hermanni Hyytiälä]

CVSROOT:        /cvsroot/storm
Module name:    storm
Changes by:     Hermanni Hyytiälä <address@hidden>      03/04/28 05:40:53

Modified files:
        org/nongnu/storm: BlockId.java 

Log message:
        Uups

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/org/nongnu/storm/BlockId.java.diff?tr1=1.16&tr2=1.17&r1=text&r2=text

Patches:
Index: storm/org/nongnu/storm/BlockId.java
diff -u storm/org/nongnu/storm/BlockId.java:1.16 
storm/org/nongnu/storm/BlockId.java:1.17
--- storm/org/nongnu/storm/BlockId.java:1.16    Mon Apr 28 05:22:49 2003
+++ storm/org/nongnu/storm/BlockId.java Mon Apr 28 05:40:53 2003
@@ -49,12 +49,9 @@
     public BlockId(String uri) throws IllegalArgumentException {
        uri = uri.toLowerCase().intern();
        this.uri = uri;
-               
+       
        int dot = uri.lastIndexOf('.');
        int comma = uri.lastIndexOf(',');
-<<<<<<< BlockId.java
-       
-=======
 
        if(!uri.startsWith(PREFIX))
            throw new IllegalArgumentException("Storm URN must start "+PREFIX);
@@ -64,8 +61,7 @@
            throw new IllegalArgumentException("1st hash must be 32 chars");
        if(uri.length() - dot != 39 + 1) 
            throw new IllegalArgumentException("2nd hash must be 39 chars");
-
->>>>>>> 1.13
+           
        contentType = uri.substring(PREFIX_LEN, comma);
        checkContentType(contentType);