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 ju...@apache.org on 2013/07/08 14:34:19 UTC
svn commit: r1500694 -
/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/NodeDelegate.java
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;
+ }
}
}
}