commit 23f42a3a93f55ecd21b680dcfe77046947557ae5
author Karl Pauls <pauls@apache.org> Tue Apr 25 16:08:38 2017 +0000
committer Karl Pauls <pauls@apache.org> Tue Apr 25 16:08:38 2017 +0000
tree 6e6ef07baa89e091c5fadd3547a654ebe824bc1a
parent 57bf3eb94c3904d9ddb1fe685e916b26508115e3

Set needsScan to false at the end of a scan instead of at the beginning in order to keep scanning when an exception occurs during a scan (SLING-6786).

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1792627 13f79535-47bb-0310-9956-ffa450edef68

src/main/java/org/apache/sling/installer/provider/jcr/impl/WatchedFolder.java

diff --git a/src/main/java/org/apache/sling/installer/provider/jcr/impl/WatchedFolder.java b/src/main/java/org/apache/sling/installer/provider/jcr/impl/WatchedFolder.java
index 1c67427..6f32ebf 100644
--- a/src/main/java/org/apache/sling/installer/provider/jcr/impl/WatchedFolder.java
+++ b/src/main/java/org/apache/sling/installer/provider/jcr/impl/WatchedFolder.java
@@ -115,7 +115,6 @@
      */
     public ScanResult scan() throws RepositoryException {
         logger.debug("Scanning {}", path);
-        needsScan = false;
 
         Node folder = null;
         if (session.itemExists(path)) {
@@ -150,6 +149,8 @@
             digests.put(r.getId(), r.getDigest());
         }
 
+        needsScan = false;
+
         return result;
     }