You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by al...@apache.org on 2013/02/15 14:13:48 UTC

svn commit: r1446564 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexUtils.java

Author: alexparvulescu
Date: Fri Feb 15 13:13:48 2013
New Revision: 1446564

URL: http://svn.apache.org/r1446564
Log:
OAK-583 Inconsistencies in property index definitions
 - removed fixme

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexUtils.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexUtils.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexUtils.java?rev=1446564&r1=1446563&r2=1446564&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexUtils.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexUtils.java Fri Feb 15 13:13:48 2013
@@ -75,12 +75,7 @@ public class IndexUtils implements Index
         if (unique) {
             entry.setProperty(IndexConstants.UNIQUE_PROPERTY_NAME, unique);
         }
-        // FIXME OAK-583
-        if (propertyNames.size() == 1) {
-            entry.setProperty(IndexConstants.PROPERTY_NAMES, propertyNames.get(0));
-        } else {
-            entry.setProperty(PropertyStates.createProperty(IndexConstants.PROPERTY_NAMES, propertyNames, Type.STRINGS));
-        }
+        entry.setProperty(PropertyStates.createProperty(IndexConstants.PROPERTY_NAMES, propertyNames, Type.STRINGS));
         if (declaringNodeTypeNames != null && !declaringNodeTypeNames.isEmpty()) {
             entry.setProperty(PropertyStates.createProperty(IndexConstants.DECLARING_NODE_TYPES, declaringNodeTypeNames, Type.STRINGS));
         }