jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
Subject svn commit: r1027182 - /jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/QPropertyDefinitionImpl.java
Date Mon, 25 Oct 2010 16:11:03 GMT
Author: stefan
Date: Mon Oct 25 16:11:03 2010
New Revision: 1027182

URL: http://svn.apache.org/viewvc?rev=1027182&view=rev
Log:
JCR-2799 QPropertyDefinitionImpl.equals() is implemented incorrectly

Modified:
    jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/QPropertyDefinitionImpl.java

Modified: jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/QPropertyDefinitionImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/QPropertyDefinitionImpl.java?rev=1027182&r1=1027181&r2=1027182&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/QPropertyDefinitionImpl.java
(original)
+++ jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/QPropertyDefinitionImpl.java
Mon Oct 25 16:11:03 2010
@@ -250,10 +250,10 @@ public class QPropertyDefinitionImpl ext
                     && multiple == other.isMultiple()
                     && fullTextSearchable == other.isFullTextSearchable()
                     && queryOrderable == other.isQueryOrderable()
-                    && (valueConstraints == null || other.getValueConstraints() ==
null) ? (valueConstraints == other.getValueConstraints())
-                        : new HashSet(Arrays.asList(valueConstraints)).equals(new HashSet(Arrays.asList(other.getValueConstraints())))
-                    && (defaultValues == null || other.getDefaultValues() == null)
? (defaultValues == other.getDefaultValues())
-                        : new HashSet(Arrays.asList(defaultValues)).equals(new HashSet(Arrays.asList(other.getDefaultValues())))
+                    && ((valueConstraints == null || other.getValueConstraints()
== null) ? (valueConstraints == other.getValueConstraints())
+                        : new HashSet(Arrays.asList(valueConstraints)).equals(new HashSet(Arrays.asList(other.getValueConstraints()))))
+                    && ((defaultValues == null || other.getDefaultValues() == null)
? (defaultValues == other.getDefaultValues())
+                        : new HashSet(Arrays.asList(defaultValues)).equals(new HashSet(Arrays.asList(other.getDefaultValues()))))
                     && new HashSet(Arrays.asList(availableQueryOperators)).equals(new
HashSet(Arrays.asList(other.getAvailableQueryOperators())));
         }
         return false;



Mime
View raw message