Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-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 CE8CFD846 for ; Wed, 5 Dec 2012 19:20:04 +0000 (UTC) Received: (qmail 86497 invoked by uid 500); 5 Dec 2012 19:20:04 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 86469 invoked by uid 500); 5 Dec 2012 19:20:04 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 86460 invoked by uid 99); 5 Dec 2012 19:20:04 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Dec 2012 19:20:04 +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, 05 Dec 2012 19:20:02 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 1C39823889BF; Wed, 5 Dec 2012 19:19:41 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1417592 - in /hbase/branches/0.89-fb/src: main/java/org/apache/hadoop/hbase/util/Threads.java test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java Date: Wed, 05 Dec 2012 19:19:40 -0000 To: commits@hbase.apache.org From: liyin@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121205191941.1C39823889BF@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: liyin Date: Wed Dec 5 19:19:39 2012 New Revision: 1417592 URL: http://svn.apache.org/viewvc?rev=1417592&view=rev Log: [HBASE-7275] Fix two bugs in HBase based on findBugs report Author: liyintang Summary: Fix two bugs in HBase based on findBugs report Test Plan: will run all the unit tests Reviewers: kannan, adela Reviewed By: adela CC: hbase-eng@ Differential Revision: https://phabricator.fb.com/D647620 Modified: hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/util/Threads.java hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java Modified: hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/util/Threads.java URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/util/Threads.java?rev=1417592&r1=1417591&r2=1417592&view=diff ============================================================================== --- hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/util/Threads.java (original) +++ hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/util/Threads.java Wed Dec 5 19:19:39 2012 @@ -244,7 +244,7 @@ public class Threads { public static void renameThread(Thread t, String newName) { String oldName = t.getName(); - if (!t.equals(newName)) { + if (!oldName.equals(newName)) { LOG.info("Thread '" + oldName + "' is now known as '" + newName + "'"); t.setName(newName); } Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java?rev=1417592&r1=1417591&r2=1417592&view=diff ============================================================================== --- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java (original) +++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java Wed Dec 5 19:19:39 2012 @@ -1521,7 +1521,7 @@ public class TestHRegion extends HBaseTe for (byte[] cf : families) { for (long t : timestamps) { put.add(cf, null, t, null); - if (cf.equals(families[1]) || cf.equals(families[3])) { + if (Bytes.compareTo(cf, families[1]) == 0 || Bytes.compareTo(cf, families[3]) == 0) { expected.add(new KeyValue(row, cf, null, t, KeyValue.Type.Put, null)); }