commit 57580399a1cd60eed330235a6c4a7e0f02eb580b
author Carsten Ziegeler <cziegeler@apache.org> Tue Mar 10 16:57:07 2015 +0000
committer Carsten Ziegeler <cziegeler@apache.org> Tue Mar 10 16:57:07 2015 +0000
tree 365c91581bb2ab996efa58ca3ff1482a05803606
parent 4b04104757aebf0cab705dc33ce2c6fa9d76432a

SLING-4490 : Refactor JCR installer

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

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

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 7978f26..c7bb8df 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
@@ -190,7 +190,7 @@
         /** Used for synchronizing. */
         final Object lock = new Object();
 
-        final AtomicBoolean active = new AtomicBoolean(true);
+        final AtomicBoolean active = new AtomicBoolean(false);
 
         private final AtomicBoolean running = new AtomicBoolean(false);
 
@@ -204,7 +204,7 @@
         /** Session shared by all WatchedFolder */
         private volatile Session session;
 
-        StoppableThread(final InstallerConfig cfg) {
+        StoppableThread(final InstallerConfig cfg) throws RepositoryException {
             this.cfg = cfg;
             setName("JcrInstaller." + String.valueOf(bgThreadCounter.incrementAndGet()));
             setDaemon(true);
@@ -263,20 +263,20 @@
                 }
 
                 // Scan watchedFolders and register resources with installer
-                for(final WatchedFolder f : watchedFolders) {
-                    f.start();
-                }
                 final List<InstallableResource> resources = new LinkedList<InstallableResource>();
                 for(final WatchedFolder f : watchedFolders) {
+                    f.start();
                     final WatchedFolder.ScanResult r = f.scan();
                     logger.debug("Startup: {} provides resources {}", f, r.toAdd);
                     resources.addAll(r.toAdd);
                 }
                 logger.debug("Registering {} resources with OSGi installer: {}", resources.size(), resources);
                 installer.registerResources(URL_SCHEME, resources.toArray(new InstallableResource[resources.size()]));
-            } catch (final RepositoryException re) {
-                logger.error("Repository exception during startup - deactivating installer!", re);
-                active.set(false);
+                this.active.set(true);
+            } finally {
+                if ( !this.active.get() ) {
+                    shutdown();
+                }
             }
         }
 
@@ -349,16 +349,17 @@
         logger.info("Activating Apache Sling JCR Installer");
         final InstallerConfig cfg = new InstallerConfig(logger, componentContext, oldConfiguration, settings);
 
-        backgroundThread = new StoppableThread(cfg);
-        if ( !backgroundThread.active.get() ) {
+        try {
+            this.backgroundThread = new StoppableThread(cfg);
+            backgroundThread.start();
+        } catch (final RepositoryException re) {
+            logger.error("Repository exception during startup - deactivating installer!", re);
             final ComponentContext ctx = componentContext;
             if ( ctx  != null ) {
                 final String name = (String) componentContext.getProperties().get(
                         ComponentConstants.COMPONENT_NAME);
                 ctx.disableComponent(name);
             }
-        } else {
-            backgroundThread.start();
         }
     }
 
@@ -632,11 +633,13 @@
             logger.warn("Exception in runOneCycle()", e);
         }
 
-        synchronized ( backgroundThread.lock ) {
-            try {
-                backgroundThread.lock.wait(RUN_LOOP_DELAY_MSEC);
-            } catch (final InterruptedException ignore) {
-                Thread.currentThread().interrupt();
+        if ( backgroundThread.active.get() ) {
+            synchronized ( backgroundThread.lock ) {
+                try {
+                    backgroundThread.lock.wait(RUN_LOOP_DELAY_MSEC);
+                } catch (final InterruptedException ignore) {
+                    Thread.currentThread().interrupt();
+                }
             }
         }
         counters[RUN_LOOP_COUNTER]++;