You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2015/04/07 10:15:13 UTC

svn commit: r1671755 - /sling/trunk/installer/providers/jcr/src/main/java/org/apache/sling/installer/provider/jcr/impl/JcrInstaller.java

Author: cziegeler
Date: Tue Apr  7 08:15:13 2015
New Revision: 1671755

URL: http://svn.apache.org/r1671755
Log:
SLING-4564 : Use a single listener registered for multiple path in JCR installer. Refactor watched folder to be part of the configuration

Modified:
    sling/trunk/installer/providers/jcr/src/main/java/org/apache/sling/installer/provider/jcr/impl/JcrInstaller.java

Modified: sling/trunk/installer/providers/jcr/src/main/java/org/apache/sling/installer/provider/jcr/impl/JcrInstaller.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/providers/jcr/src/main/java/org/apache/sling/installer/provider/jcr/impl/JcrInstaller.java?rev=1671755&r1=1671754&r2=1671755&view=diff
==============================================================================
--- sling/trunk/installer/providers/jcr/src/main/java/org/apache/sling/installer/provider/jcr/impl/JcrInstaller.java (original)
+++ sling/trunk/installer/providers/jcr/src/main/java/org/apache/sling/installer/provider/jcr/impl/JcrInstaller.java Tue Apr  7 08:15:13 2015
@@ -212,7 +212,7 @@ public class JcrInstaller implements Upd
                 // 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 @@ public class JcrInstaller implements Upd
             }
             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 @@ public class JcrInstaller implements Upd
 
             // Rescan WatchedFolders if needed
             boolean scanWf = false;
-            for(WatchedFolder wf : cfg.getWatchedFolders()) {
+            for(final WatchedFolder wf : cfg.getWatchedFolders()) {
                 if (!wf.needsScan()) {
                     continue;
                 }