commit 6b6c09e0d0670151e98b244a3c20149e4dfacfbd
author Guillaume Nodet <gnodet@apache.org> Thu Jul 24 16:09:16 2008 +0000
committer Guillaume Nodet <gnodet@apache.org> Thu Jul 24 16:09:16 2008 +0000
tree f85adbb9337d114ebb5577688f971b37c54fa7b0
parent e14d05054500264b144d98c6c71d3dadaa028f68
parent 87a19445daea0ae1afb2435e8413a4282b029a88

[maven-release-plugin]  copy for tag specs-1.0.1

git-svn-id: https://svn.apache.org/repos/asf/servicemix/smx4/specs/tags/specs-1.0.1@679444 13f79535-47bb-0310-9956-ffa450edef68

locator/src/main/java/org/apache/servicemix/specs/locator/Activator.java

diff --git a/locator/src/main/java/org/apache/servicemix/specs/locator/Activator.java b/locator/src/main/java/org/apache/servicemix/specs/locator/Activator.java
index 8ca6477..cd8a49d 100644
--- a/locator/src/main/java/org/apache/servicemix/specs/locator/Activator.java
+++ b/locator/src/main/java/org/apache/servicemix/specs/locator/Activator.java
@@ -47,7 +47,7 @@
 
     public synchronized void stop(BundleContext bundleContext) throws Exception {
         while (!factories.isEmpty()) {
-            unregister(bundleContext.getBundle(factories.keySet().iterator().next()));
+            unregister(factories.keySet().iterator().next());
         }
         this.bundleContext = null;
     }
@@ -56,7 +56,7 @@
         if (event.getType() == BundleEvent.RESOLVED) {
             register(event.getBundle());
         } else if (event.getType() == BundleEvent.UNRESOLVED) {
-            unregister(event.getBundle());
+            unregister(event.getBundle().getBundleId());
         }
     }
 
@@ -92,8 +92,8 @@
         }
     }
 
-    protected void unregister(Bundle bundle) {
-        Map<String, Callable<Class>> map = factories.remove(bundle.getBundleId());
+    protected void unregister(long bundleId) {
+        Map<String, Callable<Class>> map = factories.remove(bundleId);
         if (map != null) {
             for (Map.Entry<String, Callable<Class>> entry : map.entrySet()) {
                 OsgiLocator.unregister(entry.getKey(), entry.getValue());