commit 829c509828e131415883bf8430ab7d9b43419622
author Felix Meschberger <fmeschbe@apache.org> Thu Nov 01 08:36:17 2012 +0000
committer Felix Meschberger <fmeschbe@apache.org> Thu Nov 01 08:36:17 2012 +0000
tree 67779381fd0049f7a7d5c1e1b7e9f016ee034189
parent 5da6b99c20f2ae5f437884b994573f6be8b17b82

FELIX-3743 Remove uninstalled bundles from the bundle list to handle to prevent an endless loop setting the active framework start level.

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

framework/src/main/java/org/apache/felix/framework/Felix.java

diff --git a/framework/src/main/java/org/apache/felix/framework/Felix.java b/framework/src/main/java/org/apache/felix/framework/Felix.java
index 2e46de6..b360a61 100644
--- a/framework/src/main/java/org/apache/felix/framework/Felix.java
+++ b/framework/src/main/java/org/apache/felix/framework/Felix.java
@@ -1227,6 +1227,14 @@
                                 Logger.LOG_ERROR,
                                 "Error locking " + tuple.m_bundle._getLocation(), ex);
                         }
+                        else
+                        {
+                            synchronized (m_startLevelBundles)
+                            {
+                                m_startLevelBundles.remove(tuple);
+                                bundlesRemaining = !m_startLevelBundles.isEmpty();
+                            }
+                        }
                         continue;
                     }