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 mr...@apache.org on 2014/01/14 11:52:48 UTC
svn commit: r1558008 -
/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImporterImpl.java
Author: mreutegg
Date: Tue Jan 14 10:52:47 2014
New Revision: 1558008
URL: http://svn.apache.org/r1558008
Log:
OAK-1319: Skip lock check on import for new item
Modified:
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImporterImpl.java
Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImporterImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImporterImpl.java?rev=1558008&r1=1558007&r2=1558008&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImporterImpl.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImporterImpl.java Tue Jan 14 10:52:47 2014
@@ -155,7 +155,8 @@ public class ImporterImpl implements Imp
if (!vMgr.isCheckedOut(absPath)) {
throw new VersionException("Target node is checked in.");
}
- if (sessionContext.getWorkspace().getLockManager().isLocked(absPath)) {
+ if (importTargetTree.getStatus() != Tree.Status.NEW
+ && sessionContext.getWorkspace().getLockManager().isLocked(absPath)) {
throw new LockException("Target node is locked.");
}
ntTypesRoot = root.getTree(NODE_TYPES_PATH);