jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r1488687 - /jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/NodeMixinUtil.java
Date Sun, 02 Jun 2013 11:58:34 GMT
Author: jukka
Date: Sun Jun  2 11:58:33 2013
New Revision: 1488687

URL: http://svn.apache.org/r1488687
Log:
JCR-3604: NodeMixinUtil.getAddableMixinName() can return mixins already inherited by the node

Modified:
    jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/NodeMixinUtil.java

Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/NodeMixinUtil.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/NodeMixinUtil.java?rev=1488687&r1=1488686&r2=1488687&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/NodeMixinUtil.java
(original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/NodeMixinUtil.java
Sun Jun  2 11:58:33 2013
@@ -48,7 +48,9 @@ public class NodeMixinUtil {
 
         while (mixins.hasNext()) {
             String name = mixins.nextNodeType().getName();
-            if (node.canAddMixin(name) && !mixShareable.equals(name)) {
+            if (node.canAddMixin(name)
+                    && !node.isNodeType(name)
+                    && !mixShareable.equals(name)) {
                 return name;
             }
         }



Mime
View raw message