Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

changes after review 1 

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
This commit is contained in:
Lachlan Roberts 2018-03-09 10:03:28 +11:00
parent 946341bf85
commit affb436433
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jetty-util/src/main/java/org/eclipse/jetty/util/SearchPattern.java
View File

@ -153,10 +153,10 @@ public class SearchPattern
if(data[i] == pattern[i+matched]) if(data[i] == pattern[i+matched])
matchedCount++; matchedCount++;
else else
break; return 0;
} }
return matchedCount; return matched + matchedCount;
} }
/** /**

10
jetty-util/src/test/java/org/eclipse/jetty/util/SearchPatternTest.java
View File

@ -143,14 +143,12 @@ public class SearchPatternTest
SearchPattern sp = SearchPattern.compile(p); SearchPattern sp = SearchPattern.compile(p);
Assert.assertEquals(18,sp.match(d,0,d.length)); Assert.assertEquals(18,sp.match(d,0,d.length));
Assert.assertEquals(-1,sp.match(d,19,d.length-19)); Assert.assertEquals(-1,sp.match(d,19,d.length-19));
Assert.assertEquals(18,sp.startsWith(d,0,d.length,8)); Assert.assertEquals(26,sp.startsWith(d,0,d.length,8));
p = new String("abcdefghijklmnopqrstuvwxyz").getBytes(StandardCharsets.US_ASCII); p = new String("abcdefghijklmnopqrstuvwxyz").getBytes(StandardCharsets.US_ASCII);
d = new String("ijklmnopqrstuvwxyz abcdefghijklmnopqrstuvwxyz").getBytes(StandardCharsets.US_ASCII); d = new String("ijklmnopqrstuvwxyNOMATCH").getBytes(StandardCharsets.US_ASCII);
sp = SearchPattern.compile(p); sp = SearchPattern.compile(p);
Assert.assertEquals(19,sp.match(d,0,d.length)); Assert.assertEquals(0,sp.startsWith(d,0,d.length,8));
Assert.assertEquals(-1,sp.match(d,20,d.length-20));
Assert.assertEquals(18,sp.startsWith(d,0,d.length,8));
p = new String("abcdefghijklmnopqrstuvwxyz").getBytes(StandardCharsets.US_ASCII); p = new String("abcdefghijklmnopqrstuvwxyz").getBytes(StandardCharsets.US_ASCII);
d = new String("abcdefghijklmnopqrstuvwxyz abcdefghijklmnopqrstuvwxyz").getBytes(StandardCharsets.US_ASCII); d = new String("abcdefghijklmnopqrstuvwxyz abcdefghijklmnopqrstuvwxyz").getBytes(StandardCharsets.US_ASCII);
@ -167,6 +165,6 @@ public class SearchPatternTest
p = new String("abcdefghijklmnopqrstuvwxyz").getBytes(StandardCharsets.US_ASCII); p = new String("abcdefghijklmnopqrstuvwxyz").getBytes(StandardCharsets.US_ASCII);
d = new String("mnopqrs").getBytes(StandardCharsets.US_ASCII); d = new String("mnopqrs").getBytes(StandardCharsets.US_ASCII);
sp = SearchPattern.compile(p); sp = SearchPattern.compile(p);
Assert.assertEquals(7,sp.startsWith(d,0,d.length,12)); Assert.assertEquals(19,sp.startsWith(d,0,d.length,12));
} }
} }