svn merge -c 1334603 from trunk. Backport of HADOOP-8323. Reverts HADOOP-7940
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1334606 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
1409441e45
commit
9c4d5b4c59
|
@ -197,8 +197,6 @@ Release 2.0.0 - UNRELEASED
|
|||
|
||||
HADOOP-8104. Inconsistent Jackson versions (tucu)
|
||||
|
||||
HADOOP-7940. The Text.clear() method does not clear the bytes as intended. (Csaba Miklos via harsh)
|
||||
|
||||
HADOOP-8119. Fix javac warnings in TestAuthenticationFilter in hadoop-auth.
|
||||
(szetszwo)
|
||||
|
||||
|
|
|
@ -239,7 +239,6 @@ public class Text extends BinaryComparable
|
|||
*/
|
||||
public void clear() {
|
||||
length = 0;
|
||||
bytes = EMPTY_BYTES;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -192,16 +192,6 @@ public class TestText extends TestCase {
|
|||
assertTrue(text.find("\u20ac", 5)==11);
|
||||
}
|
||||
|
||||
public void testClear() {
|
||||
Text text = new Text();
|
||||
assertEquals("", text.toString());
|
||||
assertEquals(0, text.getBytes().length);
|
||||
text = new Text("abcd\u20acbdcd\u20ac");
|
||||
text.clear();
|
||||
assertEquals("", text.toString());
|
||||
assertEquals(0, text.getBytes().length);
|
||||
}
|
||||
|
||||
public void testFindAfterUpdatingContents() throws Exception {
|
||||
Text text = new Text("abcd");
|
||||
text.set("a".getBytes());
|
||||
|
|
Loading…
Reference in New Issue