svn commit: r1708182 - /jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/DefaultWorkspaceFilter.java

[tr...@apache.org]

Author: tripod
Date: Mon Oct 12 17:58:35 2015
New Revision: 1708182

URL: http://svn.apache.org/viewvc?rev=1708182&view=rev
Log:
JCRVLT-102 DefaultWorkspaceFilter requires access to root node

Modified:
    jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/DefaultWorkspaceFilter.java

Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/DefaultWorkspaceFilter.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/DefaultWorkspaceFilter.java?rev=1708182&r1=1708181&r2=1708182&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/DefaultWorkspaceFilter.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/DefaultWorkspaceFilter.java Mon Oct 12 17:58:35 2015
@@ -29,6 +29,7 @@ import java.util.LinkedList;
 import java.util.List;
 
 import javax.jcr.NodeIterator;
+import javax.jcr.PathNotFoundException;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 import javax.xml.parsers.DocumentBuilder;
@@ -414,12 +415,14 @@ public class DefaultWorkspaceFilter impl
         }
         String rootPath = tree.getRootPath();
         javax.jcr.Node rootNode;
-        try {
+        if (session.nodeExists(rootPath)) {
             rootNode = session.getNode(rootPath);
-        } catch (RepositoryException e) {
+        } else if (session.nodeExists("/")) {
             log.warn("Common ancestor {} not found. Using root node", rootPath);
             rootNode = session.getRootNode();
             rootPath = "/";
+        } else {
+            throw new PathNotFoundException("Common ancestor " + rootPath+ " not found.");
         }
         log.debug("Starting coverage dump at {} (skipJcrContent={})", rootPath, skipJcrContent);
         dumpCoverage(rootNode, tracker, skipJcrContent);