You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@jackrabbit.apache.org by tr...@apache.org on 2013/08/20 01:14:05 UTC

svn commit: r1515662 - /jackrabbit/commons/filevault/trunk/vault-vlt/src/main/java/org/apache/jackrabbit/vault/vlt/actions/Checkout.java

Author: tripod
Date: Mon Aug 19 23:14:04 2013
New Revision: 1515662

URL: http://svn.apache.org/r1515662
Log:
JCR-3644 vlt: NPE when checkout is executed outside jcr_root

Modified:
    jackrabbit/commons/filevault/trunk/vault-vlt/src/main/java/org/apache/jackrabbit/vault/vlt/actions/Checkout.java

Modified: jackrabbit/commons/filevault/trunk/vault-vlt/src/main/java/org/apache/jackrabbit/vault/vlt/actions/Checkout.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-vlt/src/main/java/org/apache/jackrabbit/vault/vlt/actions/Checkout.java?rev=1515662&r1=1515661&r2=1515662&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-vlt/src/main/java/org/apache/jackrabbit/vault/vlt/actions/Checkout.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-vlt/src/main/java/org/apache/jackrabbit/vault/vlt/actions/Checkout.java Mon Aug 19 23:14:04 2013
@@ -71,6 +71,8 @@ public class Checkout extends AbstractAc
             String path = ctx.getExportRoot().getJcrRoot().getPath();
             if (force) {
                 ctx.printMessage("Checkout " + mountPoint.resolve(remoteDir) + " with local files using root at " + path);
+                // ensure we use the calculated jcr_root
+                localDir = ctx.getExportRoot().getJcrRoot();
             } else {
                 throw ctx.error(localDir.getPath(),
                         "there seems to be already a checkout at " + path + ". " +