You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2007/02/19 17:42:37 UTC
svn commit: r509248 -
/jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/EffectiveNodeTypeImpl.java
Author: reschke
Date: Mon Feb 19 08:42:37 2007
New Revision: 509248
URL: http://svn.apache.org/viewvc?view=rev&rev=509248
Log:
JCR-741: allow multiple residual property definitions that only differ in OnParentVersionAction (this change resolves only part of the issue)
Modified:
jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/EffectiveNodeTypeImpl.java
Modified: jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/EffectiveNodeTypeImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/EffectiveNodeTypeImpl.java?view=diff&rev=509248&r1=509247&r2=509248
==============================================================================
--- jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/EffectiveNodeTypeImpl.java (original)
+++ jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/EffectiveNodeTypeImpl.java Mon Feb 19 08:42:37 2007
@@ -871,8 +871,11 @@
QPropertyDefinition epd = (QPropertyDefinition) existing;
// compare type & multiValued flag
if (pd.getRequiredType() == epd.getRequiredType()
- && pd.isMultiple() == epd.isMultiple()) {
+ && pd.isMultiple() == epd.isMultiple()
+ && pd.getOnParentVersion() == epd.getOnParentVersion()) {
// conflict
+ // TODO: need to take more aspects into account
+ // TODO: getMatchingPropDef needs to check this as well
String msg = "A property definition in node type '"
+ qDef.getDeclaringNodeType()
+ "' conflicts with node type '"