jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tri...@apache.org
Subject svn commit: r1661028 - /jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/util/RepositoryCopier.java
Date Thu, 19 Feb 2015 22:53:00 GMT
Author: tripod
Date: Thu Feb 19 22:52:59 2015
New Revision: 1661028

URL: http://svn.apache.org/r1661028
Log:
JCRVLT-21 "Item is protected" error during vlt rcp copy operation

Modified:
    jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/util/RepositoryCopier.java

Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/util/RepositoryCopier.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/util/RepositoryCopier.java?rev=1661028&r1=1661027&r2=1661028&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/util/RepositoryCopier.java
(original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/util/RepositoryCopier.java
Thu Feb 19 22:52:59 2015
@@ -423,7 +423,12 @@ public class RepositoryCopier {
                 // remove obsolete properties
                 for (String pName: names) {
                     try {
-                        dst.getProperty(pName).remove();
+                        // ignore protected. should not happen, unless the primary node type
changes.
+                        Property dstP = dst.getProperty(pName);
+                        if (dstP.getDefinition().isProtected()) {
+                            continue;
+                        }
+                        dstP.remove();
                     } catch (RepositoryException e) {
                         // ignore
                     }



Mime
View raw message