SLING-4564 : Use a single listener registered for multiple path in JCR installer. Refactor watched folder to be part of the configuration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1671755 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/sling/installer/provider/jcr/impl/JcrInstaller.java b/src/main/java/org/apache/sling/installer/provider/jcr/impl/JcrInstaller.java
index d85a0c0..6931ee1 100644
--- a/src/main/java/org/apache/sling/installer/provider/jcr/impl/JcrInstaller.java
+++ b/src/main/java/org/apache/sling/installer/provider/jcr/impl/JcrInstaller.java
@@ -212,7 +212,7 @@
// open session
session = repository.loginAdministrative(repository.getDefaultWorkspace());
- for (String path : cfg.getRoots()) {
+ for (final String path : cfg.getRoots()) {
listeners.add(new RootFolderListener(session, path, updateFoldersListTimer));
logger.debug("Configured root folder: {}", path);
}
@@ -288,7 +288,7 @@
}
try {
if (session != null) {
- for(RootFolderListener wfc : listeners) {
+ for(final RootFolderListener wfc : listeners) {
wfc.cleanup(session);
}
session.getWorkspace().getObservationManager().removeEventListener(this);
@@ -572,7 +572,7 @@
// Rescan WatchedFolders if needed
boolean scanWf = false;
- for(WatchedFolder wf : cfg.getWatchedFolders()) {
+ for(final WatchedFolder wf : cfg.getWatchedFolders()) {
if (!wf.needsScan()) {
continue;
}
