Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 638F19EFA for ; Wed, 29 Feb 2012 10:52:44 +0000 (UTC) Received: (qmail 1080 invoked by uid 500); 29 Feb 2012 10:52:44 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 1016 invoked by uid 500); 29 Feb 2012 10:52:44 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 1006 invoked by uid 99); 29 Feb 2012 10:52:44 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Feb 2012 10:52:44 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Feb 2012 10:52:42 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E40952388865; Wed, 29 Feb 2012 10:52:22 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1295061 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/io/Text.java src/test/java/org/apache/hadoop/io/TestText.java Date: Wed, 29 Feb 2012 10:52:22 -0000 To: common-commits@hadoop.apache.org From: harsh@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120229105222.E40952388865@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: harsh Date: Wed Feb 29 10:52:22 2012 New Revision: 1295061 URL: http://svn.apache.org/viewvc?rev=1295061&view=rev Log: HADOOP-7940. The Text.clear() method does not clear the bytes as intended. Contributed by Csaba Miklos. Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/Text.java hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestText.java Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1295061&r1=1295060&r2=1295061&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Wed Feb 29 10:52:22 2012 @@ -188,6 +188,8 @@ Release 0.23.3 - UNRELEASED HADOOP-8104. Inconsistent Jackson versions (tucu) + HADOOP-7940. The Text.clear() method does not clear the bytes as intended. (Csaba Miklos via harsh) + Release 0.23.2 - UNRELEASED INCOMPATIBLE CHANGES Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/Text.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/Text.java?rev=1295061&r1=1295060&r2=1295061&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/Text.java (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/Text.java Wed Feb 29 10:52:22 2012 @@ -239,6 +239,7 @@ public class Text extends BinaryComparab */ public void clear() { length = 0; + bytes = EMPTY_BYTES; } /* Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestText.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestText.java?rev=1295061&r1=1295060&r2=1295061&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestText.java (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestText.java Wed Feb 29 10:52:22 2012 @@ -192,6 +192,16 @@ 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());