android/okhttp
1
0
Fork 0
mirror of https://github.com/square/okhttp.git synced 2026-01-25 16:01:38 +03:00
Code Releases Activity

Merge pull request #467 from adriancole/fix-eq

Browse Source 
Fix bug in ByteString.equalsAscii when param is null and ByteString not yet initialized.
This commit is contained in:
Jesse Wilson
2014-01-20 11:35:53 -08:00
parent aa907e2de9 65ed03e0a0
commit c2f5b4728d
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
okhttp-protocols/src/main/java/com/squareup/okhttp/internal/ByteString.java
View File

@@ -67,12 +67,12 @@ public final class ByteString {
* by this byte string.
*/
public boolean equalsAscii(String ascii) {
if (ascii == this.utf8) {
return true;
}
if (ascii == null || data.length != ascii.length()) {
return false;
}
if (ascii == this.utf8) {
return true;
}
for (int i = 0; i < data.length; i++) {
if (data[i] != ascii.charAt(i)) return false;
}

1
okhttp-protocols/src/test/java/com/squareup/okhttp/internal/ByteStringTest.java
View File

@@ -50,6 +50,7 @@ public class ByteStringTest {
ByteString byteString = ByteString.encodeUtf8("Content-Length");
assertTrue(byteString.equalsAscii("Content-Length"));
assertFalse(byteString.equalsAscii("content-length"));
assertFalse(ByteString.of((byte) 0x63).equalsAscii(null));
assertFalse(byteString.equalsAscii(bronzeHorseman));
assertFalse(ByteString.encodeUtf8("Content-Length").equalsAscii("content-length"));
}