jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tri...@apache.org
Subject svn commit: r636530 - /jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/EffectiveNodeTypeImpl.java
Date Wed, 12 Mar 2008 22:01:17 GMT
Author: tripod
Date: Wed Mar 12 15:01:15 2008
New Revision: 636530

URL: http://svn.apache.org/viewvc?rev=636530&view=rev
Log:
JCR-1471 Error when registering nodetype with same propdef as supertype

Modified:
    jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/EffectiveNodeTypeImpl.java

Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/EffectiveNodeTypeImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/EffectiveNodeTypeImpl.java?rev=636530&r1=636529&r2=636530&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/EffectiveNodeTypeImpl.java
(original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/EffectiveNodeTypeImpl.java
Wed Mar 12 15:01:15 2008
@@ -675,8 +675,8 @@
                                 QPropertyDefinition pd = (QPropertyDefinition) qDef;
                                 QPropertyDefinition epd = (QPropertyDefinition) qItemDef;
                                 // compare type & multiValued flag
-                                if (pd.getRequiredType() == epd.getRequiredType()
-                                        && pd.isMultiple() == epd.isMultiple()) {
+                                if (pd.getRequiredType() != epd.getRequiredType()
+                                        || pd.isMultiple() != epd.isMultiple()) {
                                     // conflict
                                     String msg = "The property definition for '"
                                             + name + "' in node type '"



Mime
View raw message