jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mdue...@apache.org
Subject svn commit: r1462520 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveType.java
Date Fri, 29 Mar 2013 16:14:09 GMT
Author: mduerig
Date: Fri Mar 29 16:14:08 2013
New Revision: 1462520

URL: http://svn.apache.org/r1462520
Log:
OAK-730: Oak instance fails with ConstraintViolationException on concurrent write
More precise error message: include node types

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveType.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveType.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveType.java?rev=1462520&r1=1462519&r2=1462520&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveType.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveType.java
Fri Mar 29 16:14:08 2013
@@ -28,6 +28,7 @@ import java.util.List;
 import javax.annotation.Nonnull;
 import javax.jcr.nodetype.ConstraintViolationException;
 
+import com.google.common.base.Joiner;
 import org.apache.jackrabbit.oak.api.PropertyState;
 import org.apache.jackrabbit.oak.api.Type;
 import org.apache.jackrabbit.oak.spi.state.ChildNodeEntry;
@@ -212,10 +213,9 @@ class EffectiveType {
         }
 
         throw new ConstraintViolationException(
-                "Incorrect node type of child node " + nodeName);
+                "Incorrect node type of child node " + nodeName + " (" + Joiner.on(",").join(nodeType)
+ ')');
     }
 
-
     //-----------------------------------------------------------< private >--
     
     private boolean isMandatory(String name, NodeState definitions) {



Mime
View raw message