Return-Path: X-Original-To: apmail-hadoop-mapreduce-commits-archive@minotaur.apache.org Delivered-To: apmail-hadoop-mapreduce-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C2EAD4E36 for ; Fri, 8 Jul 2011 00:01:25 +0000 (UTC) Received: (qmail 76729 invoked by uid 500); 8 Jul 2011 00:01:25 -0000 Delivered-To: apmail-hadoop-mapreduce-commits-archive@hadoop.apache.org Received: (qmail 76640 invoked by uid 500); 8 Jul 2011 00:01:25 -0000 Mailing-List: contact mapreduce-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: mapreduce-dev@hadoop.apache.org Delivered-To: mailing list mapreduce-commits@hadoop.apache.org Received: (qmail 76632 invoked by uid 99); 8 Jul 2011 00:01:24 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 08 Jul 2011 00:01:24 +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, 08 Jul 2011 00:01:22 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 572A523888CB; Fri, 8 Jul 2011 00:01:01 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1144097 - in /hadoop/common/trunk/mapreduce: CHANGES.txt src/java/org/apache/hadoop/mapred/Counters.java Date: Fri, 08 Jul 2011 00:01:01 -0000 To: mapreduce-commits@hadoop.apache.org From: todd@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110708000101.572A523888CB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: todd Date: Fri Jul 8 00:01:00 2011 New Revision: 1144097 URL: http://svn.apache.org/viewvc?rev=1144097&view=rev Log: MAPREDUCE-2249. Check the reflexive property of Counters objects when comparing equality. Contributed by Devaraj K. Modified: hadoop/common/trunk/mapreduce/CHANGES.txt hadoop/common/trunk/mapreduce/src/java/org/apache/hadoop/mapred/Counters.java Modified: hadoop/common/trunk/mapreduce/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/mapreduce/CHANGES.txt?rev=1144097&r1=1144096&r2=1144097&view=diff ============================================================================== --- hadoop/common/trunk/mapreduce/CHANGES.txt (original) +++ hadoop/common/trunk/mapreduce/CHANGES.txt Fri Jul 8 00:01:00 2011 @@ -180,6 +180,9 @@ Trunk (unreleased changes) HADOOP-7106. Reorganize project SVN layout to "unsplit" the projects. (todd, nigel) + MAPREDUCE-2249. Check the reflexive property of Counters objects when + comparing equality. (Devaraj K via todd) + OPTIMIZATIONS MAPREDUCE-2026. Make JobTracker.getJobCounters() and Modified: hadoop/common/trunk/mapreduce/src/java/org/apache/hadoop/mapred/Counters.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/mapreduce/src/java/org/apache/hadoop/mapred/Counters.java?rev=1144097&r1=1144096&r2=1144097&view=diff ============================================================================== --- hadoop/common/trunk/mapreduce/src/java/org/apache/hadoop/mapred/Counters.java (original) +++ hadoop/common/trunk/mapreduce/src/java/org/apache/hadoop/mapred/Counters.java Fri Jul 8 00:01:00 2011 @@ -271,10 +271,16 @@ public class Counters implements Writabl * Checks for (content) equality of Groups */ @Override - public synchronized boolean equals(Object obj) { + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (obj == null || obj.getClass() != getClass()) { + return false; + } boolean isEqual = false; - if (obj != null && obj instanceof Group) { - Group g = (Group) obj; + Group g = (Group) obj; + synchronized (this) { if (size() == g.size()) { isEqual = true; for (Map.Entry entry : subcounters.entrySet()) { @@ -769,10 +775,16 @@ public class Counters implements Writabl } @Override - public synchronized boolean equals(Object obj) { + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (obj == null || obj.getClass() != getClass()) { + return false; + } boolean isEqual = false; - if (obj != null && obj instanceof Counters) { - Counters other = (Counters) obj; + Counters other = (Counters) obj; + synchronized (this) { if (size() == other.size()) { isEqual = true; for (Map.Entry entry : this.counters.entrySet()) {