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 tr...@apache.org on 2014/08/14 11:35:04 UTC

svn commit: r1617903 - in /jackrabbit/oak/trunk: oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/name/NameValidator.java oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/MiscTest.java

Author: tripod
Date: Thu Aug 14 09:35:03 2014
New Revision: 1617903

URL: http://svn.apache.org/r1617903
Log:
OAK-2032 Setting a MV Name property does not validate the namespaces

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/name/NameValidator.java
    jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/MiscTest.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/name/NameValidator.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/name/NameValidator.java?rev=1617903&r1=1617902&r2=1617903&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/name/NameValidator.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/name/NameValidator.java Thu Aug 14 09:35:03 2014
@@ -72,7 +72,7 @@ class NameValidator extends DefaultValid
 
     protected void checkValidValue(PropertyState property)
             throws CommitFailedException {
-        if (NAME.equals(property.getType())) {
+        if (NAME.equals(property.getType()) || NAMES.equals(property.getType())) {
             for (String value : property.getValue(NAMES)) {
                 checkValidValue(value);
             }

Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/MiscTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/MiscTest.java?rev=1617903&r1=1617902&r2=1617903&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/MiscTest.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/MiscTest.java Thu Aug 14 09:35:03 2014
@@ -46,7 +46,6 @@ public class MiscTest extends AbstractRe
         traverse(index);
     }
 
-    @Ignore("OAK-2032")
     @Test
     public void testMVNameProperty() throws Exception {
         Session session = getAdminSession();