karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject [1/2] karaf git commit: handle getDescription() fallback consistently
Date Wed, 17 Feb 2016 14:48:10 GMT
Repository: karaf
Updated Branches:
  refs/heads/karaf-4.0.x bc343cce4 -> 6af688ebe


handle getDescription() fallback consistently

Signed-off-by: Markus Rathgeb <maggu2810@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/085076e7
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/085076e7
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/085076e7

Branch: refs/heads/karaf-4.0.x
Commit: 085076e715a9f6a9caa2b12f0f41a4eb83a15717
Parents: 77c8293
Author: Markus Rathgeb <maggu2810@gmail.com>
Authored: Wed Feb 10 23:00:20 2016 +0100
Committer: Markus Rathgeb <maggu2810@gmail.com>
Committed: Wed Feb 10 23:00:20 2016 +0100

----------------------------------------------------------------------
 .../main/java/org/apache/karaf/shell/compat/CommandTracker.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/085076e7/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 0e5c2e6..072857f 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
@@ -190,7 +190,7 @@ public class CommandTracker implements ServiceTrackerCustomizer<Object,
Object>
                             if (property != null) {
                                 return property.toString();
                             } else {
-                                return null;
+                                return getName();
                             }
                         }
 


Mime
View raw message