jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r1500694 - /jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/NodeDelegate.java
Date Mon, 08 Jul 2013 12:34:19 GMT
Author: jukka
Date: Mon Jul  8 12:34:19 2013
New Revision: 1500694

URL: http://svn.apache.org/r1500694
Log:
OAK-702: Optimize access to node type information

Don't allow a multi-valued property definition to match a single-valued, or vice versa

Modified:
    jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/NodeDelegate.java

Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/NodeDelegate.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/NodeDelegate.java?rev=1500694&r1=1500693&r2=1500694&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/NodeDelegate.java
(original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/NodeDelegate.java
Mon Jul  8 12:34:19 2013
@@ -517,7 +517,9 @@ public class NodeDelegate extends ItemDe
             }
             if (!exactTypeMatch) {
                 for (Tree def : definitions.getChildren()) {
-                    return def;
+                    if (propertyType.isArray() == getBoolean(def, JCR_MULTIPLE)) {
+                        return def;
+                    }
                 }
             }
         }
@@ -535,7 +537,9 @@ public class NodeDelegate extends ItemDe
             }
             if (!exactTypeMatch) {
                 for (Tree def : definitions.getChildren()) {
-                    return def;
+                    if (propertyType.isArray() == getBoolean(def, JCR_MULTIPLE)) {
+                        return def;
+                    }
                 }
             }
         }



Mime
View raw message