Repository: karaf Updated Branches: refs/heads/karaf-4.1.x 7e7a12749 -> e5241da63
[KARAF-5211] Prevent NPE in StoredWiringResolver when trying to delete bundle wiring Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/e5241da6 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/e5241da6 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/e5241da6 Branch: refs/heads/karaf-4.1.x Commit: e5241da638a384cfcbbd6d3609a7b8a5a6b5479d Parents: 7e7a127 Author: Jean-Baptiste Onofré <[email protected]> Authored: Fri Jun 23 11:18:45 2017 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Fri Jun 23 11:19:32 2017 +0200 ---------------------------------------------------------------------- .../apache/karaf/features/extension/StoredWiringResolver.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/e5241da6/features/extension/src/main/java/org/apache/karaf/features/extension/StoredWiringResolver.java ---------------------------------------------------------------------- diff --git a/features/extension/src/main/java/org/apache/karaf/features/extension/StoredWiringResolver.java b/features/extension/src/main/java/org/apache/karaf/features/extension/StoredWiringResolver.java index ebbfe9c..0d7de17 100644 --- a/features/extension/src/main/java/org/apache/karaf/features/extension/StoredWiringResolver.java +++ b/features/extension/src/main/java/org/apache/karaf/features/extension/StoredWiringResolver.java @@ -108,6 +108,8 @@ class StoredWiringResolver implements ResolverHook { } synchronized void delete(Bundle bundle) { - wiring.get(bundle.getBundleId()).delete(path); + if (wiring.get(bundle.getBundleId()) != null) { + wiring.get(bundle.getBundleId()).delete(path); + } } }
