svn commit: r1680643 - /jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/JackrabbitNodeState.java

[baedke]

Author: baedke
Date: Wed May 20 18:02:03 2015
New Revision: 1680643

URL: http://svn.apache.org/r1680643
Log:
OAK-2893: RepositoryUpgrade.copy() should optionally continue on errors.

Setting the primary type of erroneous nodes to nt:unstructured to avoid 
constraint violations in the target repository.

Modified:
    
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/JackrabbitNodeState.java

Modified: 
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/JackrabbitNodeState.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/JackrabbitNodeState.java?rev=1680643&r1=1680642&r2=1680643&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/JackrabbitNodeState.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/JackrabbitNodeState.java
 Wed May 20 18:02:03 2015
@@ -247,7 +247,10 @@ class JackrabbitNodeState extends Abstra
                     throw new IllegalStateException(
                             "Unable to access child node " + name, e);
                 }
-                warn("Skipping broken child node entry " + name, e);
+                warn("Skipping broken child node entry " + name + " and 
changing the primary type to nt:unstructured", e);
+                properties.put(JCR_PRIMARYTYPE, PropertyStates.createProperty(
+                        JCR_PRIMARYTYPE, NT_UNSTRUCTURED, Type.NAME));
+
             }
         }
         checkValidName(name);