Repository: karaf Updated Branches: refs/heads/master 39a207507 -> 2fff9f7cb
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/2fff9f7c Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/2fff9f7c Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/2fff9f7c Branch: refs/heads/master Commit: 2fff9f7cb389b58a565e8ae91fb0ebe138dbf7c4 Parents: 39a2075 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 14:08:49 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/2fff9f7c/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 dcc1a56..55e9914 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 @@ -398,7 +398,7 @@ public class InstallKarsMojo extends MojoSupport { boolean found = true; for (String condition : conditional.getCondition()) { if (!condition.startsWith("req:")) { - if (!installedFeatures.contains(condition) && !bootFeatures.contains(condition)) { + if ((installedFeatures != null && !installedFeatures.contains(condition)) && (bootFeatures != null && !bootFeatures.contains(condition))) { found = false; break; }
