svn commit: r1404499 - /felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java

[fmeschbe]

Author: fmeschbe
Date: Thu Nov  1 08:36:17 2012
New Revision: 1404499

URL: http://svn.apache.org/viewvc?rev=1404499&view=rev
Log:
FELIX-3743 Remove uninstalled bundles from the bundle list to handle to prevent 
an endless loop setting the active framework start level.

Modified:
    felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java

Modified: 
felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java?rev=1404499&r1=1404498&r2=1404499&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java 
(original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java 
Thu Nov  1 08:36:17 2012
@@ -1227,6 +1227,14 @@ public class Felix extends BundleImpl im
                                 Logger.LOG_ERROR,
                                 "Error locking " + 
tuple.m_bundle._getLocation(), ex);
                         }
+                        else
+                        {
+                            synchronized (m_startLevelBundles)
+                            {
+                                m_startLevelBundles.remove(tuple);
+                                bundlesRemaining = 
!m_startLevelBundles.isEmpty();
+                            }
+                        }
                         continue;
                     }