Repository: karaf Updated Branches: refs/heads/master 52da062c5 -> 404f4149a
[KARAF-5181] Prevent NPE in threads command Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/404f4149 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/404f4149 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/404f4149 Branch: refs/heads/master Commit: 404f4149aff043347b0753443eb3d2ad72d4f519 Parents: 52da062 Author: Jean-Baptiste Onofré <[email protected]> Authored: Thu Jun 8 16:08:41 2017 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Thu Jun 8 16:08:41 2017 +0200 ---------------------------------------------------------------------- .../shell/commands/impl/ThreadsAction.java | 22 +++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/404f4149/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/ThreadsAction.java ---------------------------------------------------------------------- diff --git a/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/ThreadsAction.java b/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/ThreadsAction.java index 0b11964..02ca1d0 100644 --- a/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/ThreadsAction.java +++ b/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/ThreadsAction.java @@ -239,17 +239,19 @@ public class ThreadsAction implements Action { public boolean isInteresting() { int nb = 0; - StackTraceElement[] stacktrace = info.getStackTrace(); - for (StackTraceElement ste : stacktrace) { - boolean interestingLine = true; - for (String pkg : packages) { - if (ste.getClassName().startsWith(pkg)) { - interestingLine = false; - break; + if (info != null && info.getStackTrace() != null) { + StackTraceElement[] stacktrace = info.getStackTrace(); + for (StackTraceElement ste : stacktrace) { + boolean interestingLine = true; + for (String pkg : packages) { + if (ste.getClassName().startsWith(pkg)) { + interestingLine = false; + break; + } + } + if (interestingLine) { + nb++; } - } - if (interestingLine) { - nb++; } } return nb >= threshold;
