You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by st...@apache.org on 2006/10/30 18:02:38 UTC

svn commit: r469196 - /jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/EffectiveNodeType.java

Author: stefan
Date: Mon Oct 30 09:02:37 2006
New Revision: 469196

URL: http://svn.apache.org/viewvc?view=rev&rev=469196
Log:
minor cleaning up 

Modified:
    jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/EffectiveNodeType.java

Modified: jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/EffectiveNodeType.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/EffectiveNodeType.java?view=diff&rev=469196&r1=469195&r2=469196
==============================================================================
--- jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/EffectiveNodeType.java (original)
+++ jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/EffectiveNodeType.java Mon Oct 30 09:02:37 2006
@@ -615,7 +615,6 @@
                         break;
                     } catch (ConstraintViolationException e) {
                         cve = e;
-                        continue;
                     }
                 }
                 if (!satisfied) {
@@ -699,10 +698,7 @@
                         // found named node definition
                         return nd;
                     } else {
-                        if (nd.getDefaultPrimaryType() == null) {
-                            // no default node type defined, try next
-                            continue;
-                        } else {
+                        if (nd.getDefaultPrimaryType() != null) {
                             // found node definition with default node type
                             return nd;
                         }