Repository: karaf Updated Branches: refs/heads/karaf-3.0.x 7f9ba5ba0 -> 9ebc6e7cb
Fix potential NPE on condition check in the install-kar goal Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/9ebc6e7c Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/9ebc6e7c Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/9ebc6e7c Branch: refs/heads/karaf-3.0.x Commit: 9ebc6e7cbb6fa2662cad1331b0498a1441e91ac3 Parents: 7f9ba5b Author: Jean-Baptiste Onofré <[email protected]> Authored: Fri Sep 26 13:49:45 2014 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Fri Sep 26 13:49:45 2014 +0200 ---------------------------------------------------------------------- .../java/org/apache/karaf/tooling/features/InstallKarsMojo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/9ebc6e7c/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java ---------------------------------------------------------------------- diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java index 00873f7..c9d5b7c 100644 --- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java +++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java @@ -397,7 +397,7 @@ public class InstallKarsMojo extends MojoSupport { for (Conditional conditional : feature.getConditional()) { boolean found = true; for (Dependency condition : conditional.getCondition()) { - if (!installedFeatures.contains(condition.getName()) && !bootFeatures.contains(condition.getName())) { + if ((installedFeatures != null && !installedFeatures.contains(condition.getName())) && (bootFeatures != null && !bootFeatures.contains(condition.getName()))) { found = false; break; }
