You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2016/07/10 06:57:34 UTC
svn commit: r1752064 -
/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/preferences/UserPreferencesImpl.java
Author: rgodfrey
Date: Sun Jul 10 06:57:33 2016
New Revision: 1752064
URL: http://svn.apache.org/viewvc?rev=1752064&view=rev
Log:
QPID-7247 : Ensure comparator only returns 0 if the two preferences are the same preference
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/preferences/UserPreferencesImpl.java
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/preferences/UserPreferencesImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/preferences/UserPreferencesImpl.java?rev=1752064&r1=1752063&r2=1752064&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/preferences/UserPreferencesImpl.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/preferences/UserPreferencesImpl.java Sun Jul 10 06:57:33 2016
@@ -56,7 +56,23 @@ public class UserPreferencesImpl impleme
@Override
public int compare(final Preference o1, final Preference o2)
{
- return _ordering.compare(o1.getName(), o2.getName());
+ int nameOrder = _ordering.compare(o1.getName(), o2.getName());
+ if(nameOrder != 0)
+ {
+ return nameOrder;
+ }
+ else
+ {
+ int typeOrder = _ordering.compare(o1.getType(), o2.getType());
+ if(typeOrder != 0)
+ {
+ return typeOrder;
+ }
+ else
+ {
+ return o1.getId().compareTo(o2.getId());
+ }
+ }
}
};
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org