You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ff...@apache.org on 2015/12/16 14:05:57 UTC
servicemix-specs git commit: [SMX4-1980] Fix NPE in Karaf-Activator
Repository: servicemix-specs
Updated Branches:
refs/heads/master 7ba61ef42 -> 976fa7926
[SMX4-1980] Fix NPE in Karaf-Activator
Project: http://git-wip-us.apache.org/repos/asf/servicemix-specs/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix-specs/commit/976fa792
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-specs/tree/976fa792
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-specs/diff/976fa792
Branch: refs/heads/master
Commit: 976fa79260e9d9e3202e54ba42659e523b5f8499
Parents: 7ba61ef
Author: Grzegorz Grzybek <gr...@gmail.com>
Authored: Wed Dec 16 10:27:36 2015 +0100
Committer: Grzegorz Grzybek <gr...@gmail.com>
Committed: Wed Dec 16 10:27:36 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/servicemix/specs/activator/Activator.java | 4 +++-
.../main/java/org/apache/servicemix/specs/locator/Activator.java | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix-specs/blob/976fa792/activator/src/main/java/org/apache/servicemix/specs/activator/Activator.java
----------------------------------------------------------------------
diff --git a/activator/src/main/java/org/apache/servicemix/specs/activator/Activator.java b/activator/src/main/java/org/apache/servicemix/specs/activator/Activator.java
index 9d977a5..b6ffaa1 100644
--- a/activator/src/main/java/org/apache/servicemix/specs/activator/Activator.java
+++ b/activator/src/main/java/org/apache/servicemix/specs/activator/Activator.java
@@ -85,7 +85,9 @@ public class Activator implements BundleActivator, SynchronousBundleListener {
public synchronized void stop(BundleContext bundleContext) throws Exception {
debugPrintln("deactivating");
- bundleContext.removeBundleListener(this);
+ if (bundleContext != null) {
+ bundleContext.removeBundleListener(this);
+ }
while (!factories.isEmpty()) {
unregister(factories.keySet().iterator().next());
}
http://git-wip-us.apache.org/repos/asf/servicemix-specs/blob/976fa792/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 42f864d..d1c5cdc 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
@@ -75,7 +75,9 @@ public class Activator implements BundleActivator, SynchronousBundleListener {
public synchronized void stop(BundleContext bundleContext) throws Exception {
debugPrintln("deactivating");
- bundleContext.removeBundleListener(this);
+ if (bundleContext != null) {
+ bundleContext.removeBundleListener(this);
+ }
while (!factories.isEmpty()) {
unregister(factories.keySet().iterator().next());
}