/[storm]/storm/org/nongnu/storm/BlockId.java
ViewVC logotype

Diff of /storm/org/nongnu/storm/BlockId.java

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.15 by tuukkah, Fri Apr 25 16:55:27 2003 UTC revision 1.16 by hemppah, Mon Apr 28 09:22:49 2003 UTC
# Line 49  public final class BlockId { Line 49  public final class BlockId {
49      public BlockId(String uri) throws IllegalArgumentException {      public BlockId(String uri) throws IllegalArgumentException {
50          uri = uri.toLowerCase().intern();          uri = uri.toLowerCase().intern();
51          this.uri = uri;          this.uri = uri;
52                    
53          int dot = uri.lastIndexOf('.');          int dot = uri.lastIndexOf('.');
54          int comma = uri.lastIndexOf(',');          int comma = uri.lastIndexOf(',');
55    <<<<<<< BlockId.java
56            
57    =======
58    
59          if(!uri.startsWith(PREFIX))          if(!uri.startsWith(PREFIX))
60              throw new IllegalArgumentException("Storm URN must start "+PREFIX);              throw new IllegalArgumentException("Storm URN must start "+PREFIX);
# Line 62  public final class BlockId { Line 65  public final class BlockId {
65          if(uri.length() - dot != 39 + 1)          if(uri.length() - dot != 39 + 1)
66              throw new IllegalArgumentException("2nd hash must be 39 chars");              throw new IllegalArgumentException("2nd hash must be 39 chars");
67    
68    >>>>>>> 1.13
69          contentType = uri.substring(PREFIX_LEN, comma);          contentType = uri.substring(PREFIX_LEN, comma);
70          checkContentType(contentType);          checkContentType(contentType);
71    

Legend:
Removed from v.1.15  
changed lines
  Added in v.1.16

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26