You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by ju...@apache.org on 2013/03/21 17:33:21 UTC
svn commit: r1459388 -
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveType.java
Author: jukka
Date: Thu Mar 21 16:33:21 2013
New Revision: 1459388
URL: http://svn.apache.org/r1459388
Log:
OAK-709: Automatic property type conversion
Use the more relaxed Jackrabbit definition matching mechanism until we have better consensus.
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=1459388&r1=1459387&r2=1459388&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 Thu Mar 21 16:33:21 2013
@@ -123,10 +123,11 @@ class EffectiveType {
}
if (definition != null) {
return definition;
- } else {
- throw new ConstraintViolationException(
- "No matching definition found for property "
- + propertyName);
+// TODO: Fall back to residual definitions until we have consensus on OAK-709
+// } else {
+// throw new ConstraintViolationException(
+// "No matching definition found for property "
+// + propertyName);
}
}
}
@@ -189,8 +190,9 @@ class EffectiveType {
}
}
- throw new ConstraintViolationException(
- "Incorrect node type of child node " + nodeName);
+// TODO: Fall back to residual definitions until we have consensus on OAK-709
+// throw new ConstraintViolationException(
+// "Incorrect node type of child node " + nodeName);
}
}
}