Fix possible NPE
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/4eed5140 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/4eed5140 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/4eed5140 Branch: refs/heads/master Commit: 4eed5140dd6af7f4ab857a8aa54339e9621a4d9f Parents: 01ffa23 Author: Guillaume Nodet <[email protected]> Authored: Tue Mar 8 13:08:59 2016 +0100 Committer: Guillaume Nodet <[email protected]> Committed: Tue Mar 8 13:16:33 2016 +0100 ---------------------------------------------------------------------- .../java/org/apache/karaf/features/internal/service/Deployer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/4eed5140/features/core/src/main/java/org/apache/karaf/features/internal/service/Deployer.java ---------------------------------------------------------------------- diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/service/Deployer.java b/features/core/src/main/java/org/apache/karaf/features/internal/service/Deployer.java index 1414b70..b7b7af6 100644 --- a/features/core/src/main/java/org/apache/karaf/features/internal/service/Deployer.java +++ b/features/core/src/main/java/org/apache/karaf/features/internal/service/Deployer.java @@ -961,7 +961,7 @@ public class Deployer { continue; } // Ignore bundles that won't be wired - List<Wire> newWires = resolution.get(resource); + List<Wire> newWires = resolution != null ? resolution.get(resource) : null; if (newWires == null) { continue; }
