Return-Path: 
 <commits-return-41557-apmail-commons-commits-archive=commons.apache.org@commons.apache.org>
X-Original-To: apmail-commons-commits-archive@minotaur.apache.org
Delivered-To: apmail-commons-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 608C111EE8
	for <apmail-commons-commits-archive@minotaur.apache.org>;
 Tue,  6 May 2014 21:32:44 +0000 (UTC)
Received: (qmail 60615 invoked by uid 500); 6 May 2014 20:43:14 -0000
Delivered-To: apmail-commons-commits-archive@commons.apache.org
Received: (qmail 60588 invoked by uid 500); 6 May 2014 20:43:10 -0000
Mailing-List: contact commits-help@commons.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@commons.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@commons.apache.org>
List-Post: <mailto:commits@commons.apache.org>
List-Id: <commits.commons.apache.org>
Reply-To: dev@commons.apache.org
Delivered-To: mailing list commits@commons.apache.org
Received: (qmail 60473 invoked by uid 99); 6 May 2014 20:42:46 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 May 2014 20:42:46 +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; Tue, 06 May 2014 20:42:45 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 1DEAF2388860;
	Tue,  6 May 2014 20:42:25 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1592874 - in /commons/proper/collections/trunk/src:
 changes/changes.xml
 main/java/org/apache/commons/collections4/comparators/FixedOrderComparator.java
Date: Tue, 06 May 2014 20:42:25 -0000
To: commits@commons.apache.org
From: tn@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20140506204225.1DEAF2388860@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: tn
Date: Tue May  6 20:42:24 2014
New Revision: 1592874

URL: http://svn.apache.org/r1592874
Log:
[COLLECTIONS-512] Fix equals method of FixedOrderComparator.

Modified:
    commons/proper/collections/trunk/src/changes/changes.xml
    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/comparators/FixedOrderComparator.java

Modified: commons/proper/collections/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/changes/changes.xml?rev=1592874&r1=1592873&r2=1592874&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/changes/changes.xml (original)
+++ commons/proper/collections/trunk/src/changes/changes.xml Tue May  6 20:42:24 2014
@@ -23,7 +23,8 @@
 
   <release version="4.1" date="TBD" description="">
     <action issue="COLLECTIONS-512" dev="tn" type="fix" due-to="Cyrille Artho">
-      "TransformingComparator" did not comply with the contract of Object#equals.
+      "TransformingComparator" and "FixedOrderComparator" did not comply with
+      the contract of "Object#equals".
     </action>
     <action issue="COLLECTIONS-510" dev="tn" type="fix" due-to="Hollis Waite">
       Fix compilation errors when using source level 1.8 and a recent java 8 compiler.

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/comparators/FixedOrderComparator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/comparators/FixedOrderComparator.java?rev=1592874&r1=1592873&r2=1592874&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/comparators/FixedOrderComparator.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/comparators/FixedOrderComparator.java Tue May  6 20:42:24 2014
@@ -285,12 +285,12 @@ public class FixedOrderComparator<T> imp
         }
         if (object.getClass().equals(this.getClass())) {
             final FixedOrderComparator<?> comp = (FixedOrderComparator<?>) object;
-            return null == map ? null == comp.map : map.equals(comp.map) &&
-                    null == unknownObjectBehavior ? null == comp.unknownObjectBehavior :
+            return (null == map ? null == comp.map : map.equals(comp.map)) &&
+                   (null == unknownObjectBehavior ? null == comp.unknownObjectBehavior :
                         unknownObjectBehavior == comp.unknownObjectBehavior &&
-                    counter == comp.counter &&
-                    isLocked == comp.isLocked &&
-                    unknownObjectBehavior == comp.unknownObjectBehavior;
+                        counter == comp.counter &&
+                        isLocked == comp.isLocked &&
+                        unknownObjectBehavior == comp.unknownObjectBehavior);
         }
         return false;
     }