Return-Path: Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: (qmail 88473 invoked from network); 4 Mar 2011 04:49:14 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 4 Mar 2011 04:49:14 -0000 Received: (qmail 26645 invoked by uid 500); 4 Mar 2011 04:49:14 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 26607 invoked by uid 500); 4 Mar 2011 04:49:13 -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 26599 invoked by uid 99); 4 Mar 2011 04:49:13 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Mar 2011 04:49:13 +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; Fri, 04 Mar 2011 04:49:11 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A2FBE2388AAA; Fri, 4 Mar 2011 04:48:50 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1077727 - /hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/metrics2/MetricsTag.java Date: Fri, 04 Mar 2011 04:48:50 -0000 To: common-commits@hadoop.apache.org From: omalley@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110304044850.A2FBE2388AAA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: omalley Date: Fri Mar 4 04:48:50 2011 New Revision: 1077727 URL: http://svn.apache.org/viewvc?rev=1077727&view=rev Log: commit ce2db7ab1e3675a235b98801f838c9e334b28a5c Author: Luke Lu Date: Mon Sep 27 15:24:17 2010 -0700 Fix metrics tag hash code for null values Modified: hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/metrics2/MetricsTag.java Modified: hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/metrics2/MetricsTag.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/metrics2/MetricsTag.java?rev=1077727&r1=1077726&r2=1077727&view=diff ============================================================================== --- hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/metrics2/MetricsTag.java (original) +++ hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/metrics2/MetricsTag.java Fri Mar 4 04:48:50 2011 @@ -78,6 +78,10 @@ public class MetricsTag { if (!this.description.equals(other.description())) { return false; } + if (this.value == null || other.value() == null) { + if (this.value == null && other.value() == null) return true; + return false; + } if (!this.value.equals(other.value())) { return false; } @@ -86,7 +90,7 @@ public class MetricsTag { @Override public int hashCode() { - return name.hashCode() ^ value.hashCode(); + return name.hashCode() ^ (value == null ? 0 : value.hashCode()); } @Override