Repository: karaf Updated Branches: refs/heads/karaf-4.0.x 939ea05c5 -> 3aa65856b
KARAF-4270: Don't NPE for commands without descriptions. (cherry picked from commit 5a00ab7ee204c05df06925f38d196840bf7f0302) Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/3aa65856 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/3aa65856 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/3aa65856 Branch: refs/heads/karaf-4.0.x Commit: 3aa65856b5416859740c3eb97120885b217ef301 Parents: 939ea05 Author: Benson Margulies <[email protected]> Authored: Fri Jan 15 09:23:56 2016 -0500 Committer: Freeman Fang <[email protected]> Committed: Wed Jan 20 11:08:23 2016 +0800 ---------------------------------------------------------------------- .../java/org/apache/karaf/shell/compat/CommandTracker.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/3aa65856/shell/console/src/main/java/org/apache/karaf/shell/compat/CommandTracker.java ---------------------------------------------------------------------- diff --git a/shell/console/src/main/java/org/apache/karaf/shell/compat/CommandTracker.java b/shell/console/src/main/java/org/apache/karaf/shell/compat/CommandTracker.java index 68e03ba..0e5c2e6 100644 --- a/shell/console/src/main/java/org/apache/karaf/shell/compat/CommandTracker.java +++ b/shell/console/src/main/java/org/apache/karaf/shell/compat/CommandTracker.java @@ -186,7 +186,12 @@ public class CommandTracker implements ServiceTrackerCustomizer<Object, Object> @Override public String getDescription() { - return reference.getProperty("osgi.command.description").toString(); + Object property = reference.getProperty("osgi.command.description"); + if (property != null) { + return property.toString(); + } else { + return null; + } } @Override
