commit bc8c66252ee3e532afb4edf86cc711d870400cea
author Chris Custine <ccustine@apache.org> Tue Dec 08 16:55:33 2009 +0000
committer Chris Custine <ccustine@apache.org> Tue Dec 08 16:55:33 2009 +0000
tree 0f580738f3c93001124316742dfdddbba1428123
parent 8255112283322e657c9358d3104468d8ac749cd9

FELIX-1928 - File installer starts bundles too early on restart
- Add check for startlevel.  If bundle startlevel is greater than the active startlevel, let the framework start it when appropriate.


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

fileinstall/src/main/java/org/apache/felix/fileinstall/internal/DirectoryWatcher.java

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 90b4e27..ae79b37 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
@@ -996,7 +996,8 @@
                 if (bundle != null)
                 {
                     if (bundle.getState() != Bundle.STARTING && bundle.getState() != Bundle.ACTIVE
-                            && FileInstall.getStartLevel().isBundlePersistentlyStarted(bundle))
+                            && FileInstall.getStartLevel().isBundlePersistentlyStarted(bundle)
+                            && FileInstall.getStartLevel().getStartLevel() > FileInstall.getStartLevel().getBundleStartLevel(bundle))
                     {
                         bundles.add(bundle);
                     }