From dc02abde7d338e175e23dc5cc74172562c2dc386 Mon Sep 17 00:00:00 2001
From: Grzegorz Grzybek <gr.grzybek@gmail.com>
Date: Mon, 17 Mar 2014 16:49:43 +0100
Subject: [PATCH] [FELIX-2702] Monitoring system state to check whether to
 reattempt starting bundles.

---
 .../internal/DirectoryWatcher.java            | 30 +++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/DirectoryWatcher.java b/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/DirectoryWatcher.java
index 8d325266355..7ceaad1a206 100644
--- a/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/DirectoryWatcher.java
+++ b/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/DirectoryWatcher.java
@@ -147,6 +147,10 @@ public class DirectoryWatcher extends Thread implements BundleListener
     // Represents artifacts that could not be installed
     Map/* <File, Artifact> */ installationFailures = new HashMap/* <File, Artifact> */();
 
+    // flag (acces to which must be synchronized) that indicates wheter there's a change in state of system,
+    // which may result in an attempt to start the watched bundles
+    private Boolean stateChanged = Boolean.FALSE;
+
     public DirectoryWatcher(Dictionary properties, BundleContext context)
     {
         super("fileinstall-" + getThreadName(properties));
@@ -335,7 +339,8 @@ public void run()
 
     public void bundleChanged(BundleEvent bundleEvent)
     {
-        if (bundleEvent.getType() == BundleEvent.UNINSTALLED)
+        int type = bundleEvent.getType();
+        if (type == BundleEvent.UNINSTALLED)
         {
             for (Iterator it = getArtifacts().iterator(); it.hasNext();)
             {
@@ -349,6 +354,10 @@ public void bundleChanged(BundleEvent bundleEvent)
                 }
             }
         }
+        if (type == BundleEvent.INSTALLED || type == BundleEvent.RESOLVED || type == BundleEvent.UNINSTALLED ||
+            type == BundleEvent.UNRESOLVED || type == BundleEvent.UPDATED) {
+            setStateChanged(true);
+        }
     }
 
     private void process(Set files) throws InterruptedException
@@ -510,10 +519,12 @@ private void process(Set files) throws InterruptedException
             {
                 // Refresh if any bundle got uninstalled or updated.
                 refresh((Bundle[]) toRefresh.toArray(new Bundle[toRefresh.size()]));
+                // set the state to reattempt starting managed bundles which aren't already STARTING or ACTIVE
+                setStateChanged(true);
             }
         }
 
-        if (startBundles)
+        if (startBundles && isStateChanged())
         {
             // Try to start all the bundles that are not persistently stopped
             startAllBundles();
@@ -522,6 +533,9 @@ private void process(Set files) throws InterruptedException
             delayedStart.removeAll(uninstalledBundles);
             // Try to start newly installed bundles, or bundles which we missed on a previous round
             startBundles(delayedStart);
+
+            // set the state as unchanged to not reattempt starting failed bundles
+            setStateChanged(false);
         }
     }
 
@@ -1490,5 +1504,17 @@ private void removeArtifact(File file)
             currentManagedArtifacts.remove(file);
         }
     }
+    
+    private void setStateChanged(boolean changed) {
+        synchronized (stateChanged) {
+            this.stateChanged = Boolean.valueOf(changed);
+        }
+    }
+
+    private boolean isStateChanged() {
+        synchronized (stateChanged) {
+            return stateChanged.booleanValue();
+        }
+    }
 
 }