You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2019/06/16 05:03:24 UTC
[karaf] branch master updated: [KARAF-6329] Prevent NPE on shutdown
in features service
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/master by this push:
new f734dfc [KARAF-6329] Prevent NPE on shutdown in features service
new 5ab0681 Merge pull request #877 from jbonofre/KARAF-6329
f734dfc is described below
commit f734dfc42fb705d91a3df0a2e1f3ee2a5047c856
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Sat Jun 15 07:14:57 2019 +0200
[KARAF-6329] Prevent NPE on shutdown in features service
---
.../java/org/apache/karaf/features/internal/osgi/Activator.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/osgi/Activator.java b/features/core/src/main/java/org/apache/karaf/features/internal/osgi/Activator.java
index 123aa0e..28226e6 100644
--- a/features/core/src/main/java/org/apache/karaf/features/internal/osgi/Activator.java
+++ b/features/core/src/main/java/org/apache/karaf/features/internal/osgi/Activator.java
@@ -303,8 +303,12 @@ public class Activator extends BaseActivator {
@Override
public void removedService(ServiceReference<FeaturesListener> reference, FeaturesListener service) {
- featuresService.unregisterListener(service);
- bundleContext.ungetService(reference);
+ if (featuresService != null && service != null) {
+ featuresService.unregisterListener(service);
+ }
+ if (bundleContext != null && reference != null) {
+ bundleContext.ungetService(reference);
+ }
}
}
);