svn commit: r1456019 - /aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintExtender.java

[cw...@apache.org]

Author: cwilkin
Date: Wed Mar 13 16:14:32 2013
New Revision: 1456019

URL: http://svn.apache.org/r1456019
Log:
ARIES-1031: Update comparison of system bundle

Modified:
    aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintExtender.java

Modified: aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintExtender.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintExtender.java?rev=1456019&r1=1456018&r2=1456019&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintExtender.java (original)
+++ aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintExtender.java Wed Mar 13 16:14:32 2013
@@ -195,7 +195,7 @@ public class BlueprintExtender implement
         // If the bundle being stopped is the system bundle,
         // do an orderly shutdown of all blueprint contexts now
         // so that service usage can actually be useful
-        if (bundle.getBundleId() == 0 && bundle.getState() == Bundle.STOPPING) {
+        if (context.getBundle(0).equals(bundle) && bundle.getState() == Bundle.STOPPING) {
             String val = context.getProperty("org.apache.aries.blueprint.preemptiveShutdown");
             if (val == null || Boolean.parseBoolean(val)) {
                 stop(context);