andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix the last value in AsciiString.trim

Browse Source 
Motivation:

In AsciiString.trim, last should be `arrayOffset() + length() - 1`. See #4741.

Modifications:

Fix the last value.

Result:

AsciiString.trim works correctly.
This commit is contained in:
Xiaoyan Lin 2016-01-21 23:24:05 -08:00 committed by Norman Maurer
parent 6dbb610f5b
commit ff11fe894d
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/main/java/io/netty/util/AsciiString.java
View File

@ -983,7 +983,7 @@ public final class AsciiString implements CharSequence, Comparable<CharSequence>
* @return a new string with characters {@code <= \\u0020} removed from the beginning and the end.
*/
public AsciiString trim() {
int start = arrayOffset(), last = arrayOffset() + length();
int start = arrayOffset(), last = arrayOffset() + length() - 1;
int end = last;
while (start <= end && value[start] <= ' ') {
start++;

8
common/src/test/java/io/netty/util/AsciiStringCharacterTest.java
View File

@ -282,4 +282,12 @@ public class AsciiStringCharacterTest {
assertEquals(2, AsciiString.indexOfIgnoreCaseAscii("aabaabaa", "", 2));
assertEquals(-1, AsciiString.indexOfIgnoreCaseAscii("abc", "", 9));
}
@Test
public void testTrim() {
assertEquals("", AsciiString.EMPTY_STRING.trim().toString());
assertEquals("abc", new AsciiString(" abc").trim().toString());
assertEquals("abc", new AsciiString("abc ").trim().toString());
assertEquals("abc", new AsciiString(" abc ").trim().toString());
}
}