Repository: karaf Updated Branches: refs/heads/karaf-2.x a2345f689 -> f9868552f
Prevent NPE in JMX ACLConfigurationParser when an argument is null Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/627bd08b Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/627bd08b Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/627bd08b Branch: refs/heads/karaf-2.x Commit: 627bd08b951c560d7f1208e47461c67c75f37704 Parents: a2345f6 Author: Guillaume Nodet <gno...@gmail.com> Authored: Thu Jun 12 23:22:51 2014 +0200 Committer: Guillaume Nodet <gno...@gmail.com> Committed: Thu Jun 12 23:22:51 2014 +0200 ---------------------------------------------------------------------- .../apache/karaf/management/tools/ACLConfigurationParser.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/627bd08b/management/server/src/main/java/org/apache/karaf/management/tools/ACLConfigurationParser.java ---------------------------------------------------------------------- diff --git a/management/server/src/main/java/org/apache/karaf/management/tools/ACLConfigurationParser.java b/management/server/src/main/java/org/apache/karaf/management/tools/ACLConfigurationParser.java index 7d63f0e..49512a6 100644 --- a/management/server/src/main/java/org/apache/karaf/management/tools/ACLConfigurationParser.java +++ b/management/server/src/main/java/org/apache/karaf/management/tools/ACLConfigurationParser.java @@ -209,7 +209,8 @@ public class ACLConfigurationParser { else sb.append(','); sb.append('"'); - sb.append(param.toString().trim()); + if (param != null) + sb.append(param.toString().trim()); sb.append('"'); } sb.append(']'); @@ -314,6 +315,8 @@ public class ACLConfigurationParser { return false; for (int i = 0; i < regexArgs.size(); i++) { + if (params[i] == null) + return false; if (!params[i].toString().trim().matches(regexArgs.get(i))) { return false; }
