jackrabbit-oak-commits mailing list archives

Author: mreutegg
Date: Tue Oct  2 15:34:25 2012
New Revision: 1392974

URL: http://svn.apache.org/viewvc?rev=1392974&view=rev
Log:
OAK-356: NamespaceValidator must ignore jcr:primaryType

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/name/NamespaceValidator.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/name/NamespaceValidator.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/name/NamespaceValidator.java?rev=1392974&r1=1392973&r2=1392974&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/name/NamespaceValidator.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/name/NamespaceValidator.java
Tue Oct  2 15:34:25 2012
@@ -38,6 +38,10 @@ class NamespaceValidator extends Default
     public void propertyAdded(PropertyState after)
             throws CommitFailedException {
         String prefix = after.getName();
+        // ignore jcr:primaryType
+        if (prefix.equals("jcr:primaryType")) {
+            return;
+        }
         if (map.containsKey(prefix)) {
             throw new NamespaceValidatorException(
                     "Namespace mapping already registered", prefix);