You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by un...@apache.org on 2014/12/11 16:13:26 UTC
svn commit: r1644668 -
/jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/NodeTypeDefDiff.java
Author: unico
Date: Thu Dec 11 15:13:25 2014
New Revision: 1644668
URL: http://svn.apache.org/r1644668
Log:
JCR-3840 limit the number of null child node definitions to match with to the number of slots available
Modified:
jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/NodeTypeDefDiff.java
Modified: jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/NodeTypeDefDiff.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/NodeTypeDefDiff.java?rev=1644668&r1=1644667&r2=1644668&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/NodeTypeDefDiff.java (original)
+++ jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/NodeTypeDefDiff.java Thu Dec 11 15:13:25 2014
@@ -717,16 +717,12 @@ public class NodeTypeDefDiff {
}
if (defs2.size() < defs1.size()) {
for (QNodeDefinition def1 : defs1) {
- for (int i = 0; i < defs1.size() - defs2.size(); i++) {
- diffs.add(new ChildNodeDefDiff(def1, null));
- }
+ diffs.add(new ChildNodeDefDiff(def1, null));
}
}
if (defs1.size() < defs2.size()) {
for (QNodeDefinition def2 : defs2) {
- for (int i = 0; i < defs2.size() - defs1.size(); i++) {
- diffs.add(new ChildNodeDefDiff(null, def2));
- }
+ diffs.add(new ChildNodeDefDiff(null, def2));
}
}
// sort them according to decreasing compatibility