[[joram-commits]] [3800] trunk/joram/src/fr/dyade/aaa/agent/osgi/Activator.java: Fix:remove dependency on felix Bundle-SymbolicName.

[guillaume.surrel@xxxxxxxxxxxxx]

Title: [3800] trunk/joram/src/fr/dyade/aaa/agent/osgi/Activator.java: Fix: remove dependency on felix Bundle-SymbolicName.

Revision

3800

Author

surrel

Date

2010-04-26 16:24:56 +0200 (Mon, 26 Apr 2010)

Log Message

Fix: remove dependency on felix Bundle-SymbolicName.
+ Add some comments.

Modified Paths

• trunk/joram/src/fr/dyade/aaa/agent/osgi/Activator.java

Diff

Modified: trunk/joram/src/fr/dyade/aaa/agent/osgi/Activator.java (3799 => 3800)

--- trunk/joram/src/fr/dyade/aaa/agent/osgi/Activator.java	2010-04-21 15:38:43 UTC (rev 3799)
+++ trunk/joram/src/fr/dyade/aaa/agent/osgi/Activator.java	2010-04-26 14:24:56 UTC (rev 3800)
@@ -34,6 +34,7 @@
 
 import fr.dyade.aaa.agent.AdminProxy;
 import fr.dyade.aaa.agent.AgentServer;
+import fr.dyade.aaa.agent.SCServerMBean;
 import fr.dyade.aaa.common.Debug;
 import fr.dyade.aaa.common.Service;
 
@@ -51,19 +52,21 @@
 
   private ServiceRegistration adminproxyRegistration;
 
+  /**
+   * Stops the whole framework if agent server was stopped an other way than
+   * stopping agent server bundle, for example using
+   * {@link SCServerMBean#stop()}. This is done to preserve the previous
+   * non-OSGi behavior.
+   */
   public static void stopFramework() {
-    Bundle[] bundles = Activator.context.getBundles();
-    for (int i = 0; i < bundles.length; i++) {
-      Bundle bundle = bundles[i];
-      if (bundle.getHeaders().get("Bundle-SymbolicName").equals("org.apache.felix.framework")) {
-        if (Activator.context.getBundle().getState() != Bundle.STOPPING) {
-          try {
-            bundle.stop();
-          } catch (BundleException exc) {
-            if (logmon.isLoggable(BasicLevel.ERROR))
-              logmon.log(BasicLevel.ERROR, "Error when stopping OSGi framework : ", exc);
-          }
-          return;
+    if (context.getBundle().getState() != Bundle.STOPPING) {
+      try {
+        // The system bundle is always assigned a bundle identifier of zero (0).
+        Bundle bundle = context.getBundle(0);
+        bundle.stop();
+      } catch (BundleException exc) {
+        if (logmon.isLoggable(BasicLevel.ERROR)) {
+          logmon.log(BasicLevel.ERROR, "Error when stopping OSGi framework : ", exc);
         }
       }
     }