[dna-commits] DNA SVN: r798 - trunk/dna-jcr/src/main/java/org/jboss/dna/jcr.

[dna-commits at lists.jboss.org]

Author: rhauch
Date: 2009-04-01 12:10:43 -0400 (Wed, 01 Apr 2009)
New Revision: 798

Modified:
   trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/RepositoryNodeTypeManager.java
Log:
DNA-338 Definitions That Allow SNS Are Not Used For Nodes Without SNS

I believe the reason the patch did not include an effective change was that Brian had multiple changes brewing in his workspace (see DNA-339).  The actual correction for this behavior was buried in RepositoryNodeTypeManager.findChildNodeDefinition(...), where the boolean determining whether SNS were required was computed incorrectly.

Modified: trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/RepositoryNodeTypeManager.java
===================================================================
--- trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/RepositoryNodeTypeManager.java	2009-04-01 15:46:00 UTC (rev 797)
+++ trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/RepositoryNodeTypeManager.java	2009-04-01 16:10:43 UTC (rev 798)
@@ -508,7 +508,7 @@
                                                int numberOfExistingChildrenWithSameName,
                                                boolean skipProtected ) {
         JcrNodeType childType = childPrimaryNodeType != null ? getNodeType(childPrimaryNodeType) : null;
-        boolean requireSns = numberOfExistingChildrenWithSameName != 0;
+        boolean requireSns = numberOfExistingChildrenWithSameName > 1;
 
         // First look in the primary type ...
         JcrNodeType primaryType = getNodeType(primaryTypeNameOfParent);