You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cc...@apache.org on 2009/12/08 17:55:34 UTC
svn commit: r888483 -
/felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/DirectoryWatcher.java
Author: ccustine
Date: Tue Dec 8 16:55:33 2009
New Revision: 888483
URL: http://svn.apache.org/viewvc?rev=888483&view=rev
Log:
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.
Modified:
felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/DirectoryWatcher.java
Modified: felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/DirectoryWatcher.java
URL: http://svn.apache.org/viewvc/felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/DirectoryWatcher.java?rev=888483&r1=888482&r2=888483&view=diff
==============================================================================
--- felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/DirectoryWatcher.java (original)
+++ felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/DirectoryWatcher.java Tue Dec 8 16:55:33 2009
@@ -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);
}