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 2014/08/11 14:29:34 UTC
svn commit: r1617264 -
/jackrabbit/commons/filevault/trunk/vault-vlt/src/main/java/org/apache/jackrabbit/vault/vlt/actions/Status.java
Author: tripod
Date: Mon Aug 11 12:29:33 2014
New Revision: 1617264
URL: http://svn.apache.org/r1617264
Log:
JCRVLT-55 vlt st should notify the user executed in a directory not under vault control
Modified:
jackrabbit/commons/filevault/trunk/vault-vlt/src/main/java/org/apache/jackrabbit/vault/vlt/actions/Status.java
Modified: jackrabbit/commons/filevault/trunk/vault-vlt/src/main/java/org/apache/jackrabbit/vault/vlt/actions/Status.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-vlt/src/main/java/org/apache/jackrabbit/vault/vlt/actions/Status.java?rev=1617264&r1=1617263&r2=1617264&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-vlt/src/main/java/org/apache/jackrabbit/vault/vlt/actions/Status.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-vlt/src/main/java/org/apache/jackrabbit/vault/vlt/actions/Status.java Mon Aug 11 12:29:33 2014
@@ -20,6 +20,7 @@ import java.io.File;
import java.util.List;
import org.apache.jackrabbit.vault.fs.api.VaultFile;
+import org.apache.jackrabbit.vault.vlt.VltContext;
import org.apache.jackrabbit.vault.vlt.VltDirectory;
import org.apache.jackrabbit.vault.vlt.VltException;
import org.apache.jackrabbit.vault.vlt.VltFile;
@@ -38,4 +39,13 @@ public class Status extends BaseAction {
throws VltException {
dir.getContext().printStatus(file);
}
+
+ @Override
+ public void run(VltContext ctx, VltTree infos) throws VltException {
+ // ensure that all directories where 'vlt st' is applied is controlled (JCRVLT-55)
+ for (VltTree.Info i: infos.infos()) {
+ i.dir.assertControlled();
+ }
+ super.run(ctx, infos);
+ }
}
\ No newline at end of file