Fix AsciiString.contentEqualsIgnoreCase

Brendt Lucas · normanmaurer · commit c13f9c412d1d · 2015-12-12T19:48:03.000+01:00
Motivation: Related to issue netty#4564. AsciiString.contentEqualsIgnoreCase fails when comparing two AsciiStrings of the same length Modifications: Compare the values of the first AsciiString to the second AsciiString Result: AsciiString.contentEqualsIgnoreCase works as expected
diff --git a/common/src/main/java/io/netty/util/AsciiString.java b/common/src/main/java/io/netty/util/AsciiString.java
@@ -530,7 +530,7 @@ public boolean contentEqualsIgnoreCase(CharSequence string) {
         if (string.getClass() == AsciiString.class) {
             AsciiString rhs = (AsciiString) string;
             for (int i = arrayOffset(), j = rhs.arrayOffset(); i < length(); ++i, ++j) {
-                if (!equalsIgnoreCase(value[i], value[j])) {
+                if (!equalsIgnoreCase(value[i], rhs.value[j])) {
                     return false;
                 }
             }
diff --git a/common/src/test/java/io/netty/util/AsciiStringCharacterTest.java b/common/src/test/java/io/netty/util/AsciiStringCharacterTest.java
@@ -240,6 +240,16 @@ public void testEqualsIgnoreCase() {
         assertThat(AsciiString.contentEqualsIgnoreCase(null, "foo"), is(false));
         assertThat(AsciiString.contentEqualsIgnoreCase("bar", null), is(false));
         assertThat(AsciiString.contentEqualsIgnoreCase("FoO", "fOo"), is(true));
+
+        // Test variations (Ascii + String, Ascii + Ascii, String + Ascii)
+        assertThat(AsciiString.contentEqualsIgnoreCase(new AsciiString("FoO"), "fOo"), is(true));
+        assertThat(AsciiString.contentEqualsIgnoreCase(new AsciiString("FoO"), new AsciiString("fOo")), is(true));
+        assertThat(AsciiString.contentEqualsIgnoreCase("FoO", new AsciiString("fOo")), is(true));
+
+        // Test variations (Ascii + String, Ascii + Ascii, String + Ascii)
+        assertThat(AsciiString.contentEqualsIgnoreCase(new AsciiString("FoO"), "bAr"), is(false));
+        assertThat(AsciiString.contentEqualsIgnoreCase(new AsciiString("FoO"), new AsciiString("bAr")), is(false));
+        assertThat(AsciiString.contentEqualsIgnoreCase("FoO", new AsciiString("bAr")), is(false));
     }
 
     @Test

Original file line number	Diff line number	Diff line change
`@@ -530,7 +530,7 @@ public boolean contentEqualsIgnoreCase(CharSequence string) {`
`530`	`530`	`if (string.getClass() == AsciiString.class) {`
`531`	`531`	`AsciiString rhs = (AsciiString) string;`
`532`	`532`	`for (int i = arrayOffset(), j = rhs.arrayOffset(); i < length(); ++i, ++j) {`
`533`		`- if (!equalsIgnoreCase(value[i], value[j])) {`
	`533`	`+ if (!equalsIgnoreCase(value[i], rhs.value[j])) {`
`534`	`534`	`return false;`
`535`	`535`	`}`
`536`	`536`	`}`