svn commit: r481245 - /jackrabbit/trunk/jackrabbit/src/test/java/org/apache/jackrabbit/test/api/nodetype/NodeTypeUtil.java

[mr...@apache.org]

Author: mreutegg
Date: Fri Dec  1 05:47:19 2006
New Revision: 481245

URL: http://svn.apache.org/viewvc?view=rev&rev=481245
Log:
JCR-658: CanAddChildNodeCallWithNodeTypeTest.testDefinedAndLegalType() may fail if protected child node definition is picked

Modified:
    jackrabbit/trunk/jackrabbit/src/test/java/org/apache/jackrabbit/test/api/nodetype/NodeTypeUtil.java

Modified: jackrabbit/trunk/jackrabbit/src/test/java/org/apache/jackrabbit/test/api/nodetype/NodeTypeUtil.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit/src/test/java/org/apache/jackrabbit/test/api/nodetype/NodeTypeUtil.java?view=diff&rev=481245&r1=481244&r2=481245
==============================================================================
--- jackrabbit/trunk/jackrabbit/src/test/java/org/apache/jackrabbit/test/api/nodetype/NodeTypeUtil.java (original)
+++ jackrabbit/trunk/jackrabbit/src/test/java/org/apache/jackrabbit/test/api/nodetype/NodeTypeUtil.java Fri Dec  1 05:47:19 2006
@@ -40,7 +40,7 @@
     public static final int ANY_PROPERTY_TYPE = -1;
 
     /**
-     * Locate a child node def parsing all node types
+     * Locate a non-protected child node def parsing all node types
      *
      * @param session                  the session to access the node types
      * @param regardDefaultPrimaryType if true, the default primary type of the
@@ -92,6 +92,10 @@
 
             for (int i = 0; i < nodeDefs.length; i++) {
                 NodeDefinition nodeDef = nodeDefs[i];
+
+                if (nodeDef.isProtected()) {
+                    continue;
+                }
 
                 if (nodeDef.getRequiredPrimaryTypes().length > 1) {
                     // behaviour of implementations that support multiple multiple inheritance