You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2012/01/06 03:39:01 UTC

svn commit: r1227940 - /geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/DependencyManager.java

Author: djencks
Date: Fri Jan  6 02:39:00 2012
New Revision: 1227940

URL: http://svn.apache.org/viewvc?rev=1227940&view=rev
Log:
GERONIMO-6249 make sure existing bundle is at least starting before trying to activate it

Modified:
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/DependencyManager.java

Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/DependencyManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/DependencyManager.java?rev=1227940&r1=1227939&r2=1227940&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/DependencyManager.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/DependencyManager.java Fri Jan  6 02:39:00 2012
@@ -192,7 +192,10 @@ public class DependencyManager {
                 if (bundleEvent == null) {
                     // existing bundles first added to the tracker with no event change
                     installed(bundle);
-                    start(bundle);
+                    //make sure existing bundle is at least starting
+                    if (bundle.getBundleContext() != null) {
+                        start(bundle);
+                    }
                 } else {
                     bundleChanged(bundleEvent);
                 }