svn commit: r1527571 - /jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeRegistry.java

[un...@apache.org]

Author: unico
Date: Mon Sep 30 13:59:31 2013
New Revision: 1527571

URL: http://svn.apache.org/r1527571
Log:
JCR-3674 ignore attempt to register node types that are already registered locally when the attempt originates from an external update

Modified:
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeRegistry.java

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeRegistry.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeRegistry.java?rev=1527571&r1=1527570&r2=1527571&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeRegistry.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeRegistry.java Mon Sep 30 13:59:31 2013
@@ -237,7 +237,7 @@ public class NodeTypeRegistry implements
         synchronized (this) {
 
             // validate and register new node type definitions
-            internalRegister(ntDefs);
+            internalRegister(ntDefs, external);
             // persist new node type definitions
             for (QNodeTypeDefinition ntDef: ntDefs) {
                 customNTDefs.add(ntDef);
@@ -775,7 +775,7 @@ public class NodeTypeRegistry implements
             loadBuiltInNodeTypeDefs(builtInNTDefs);
 
             // register built-in node types
-            internalRegister(builtInNTDefs.all(), true);
+            internalRegister(builtInNTDefs.all(), false, true);
         } catch (InvalidNodeTypeDefException intde) {
             String error =
                     "internal error: invalid built-in node type definition stored in "
@@ -792,7 +792,7 @@ public class NodeTypeRegistry implements
 
         // validate & register custom node types
         try {
-            internalRegister(customNTDefs.all());
+            internalRegister(customNTDefs.all(), false);
         } catch (InvalidNodeTypeDefException intde) {
             String error =
                     "internal error: invalid custom node type definition stored in "
@@ -1269,13 +1269,13 @@ public class NodeTypeRegistry implements
      * @throws RepositoryException if an error occurs
      * @see #registerNodeType
      */
-    private void internalRegister(Collection<QNodeTypeDefinition> ntDefs)
+    private void internalRegister(Collection<QNodeTypeDefinition> ntDefs, boolean external)
             throws InvalidNodeTypeDefException, RepositoryException {
-        internalRegister(ntDefs, false);
+        internalRegister(ntDefs, external, false);
     }
 
     /**
-     * Same as {@link #internalRegister(java.util.Collection)} except for the
+     * Same as {@link #internalRegister(java.util.Collection, boolean)} except for the
      * additional <code>lenient</code> parameter which governs whether
      * validation can be lenient (e.g. for built-in node types) or has to be
      * strict (such as in the case of custom node types). This differentiation
@@ -1284,7 +1284,7 @@ public class NodeTypeRegistry implements
      * that can be exposed in a property definition because it is
      * system-generated (such as jcr:primaryType in nt:base).
      */
-    private void internalRegister(Collection<QNodeTypeDefinition> ntDefs, boolean lenient)
+    private void internalRegister(Collection<QNodeTypeDefinition> ntDefs, boolean external, boolean lenient)
             throws InvalidNodeTypeDefException, RepositoryException {
 
         // need a list/collection that can be modified
@@ -1297,11 +1297,8 @@ public class NodeTypeRegistry implements
         // and do some preliminary checks
         for (QNodeTypeDefinition ntd : defs) {
             Name name = ntd.getName();
-            if (name != null && tmpNTDefCache.containsKey(name)) {
-                String msg = name + " already exists";
-                if (tmpNTDefCache.containsKey(name)) {
-                    msg += " locally";
-                }
+            if (!external && name != null && tmpNTDefCache.containsKey(name)) {
+                String msg = name + " already exists locally";
                 log.debug(msg);
                 throw new InvalidNodeTypeDefException(msg);
             }