You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by cs...@apache.org on 2012/05/22 15:24:13 UTC

svn commit: r1341466 - /karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/completer/CommandsCompleter.java

Author: cschneider
Date: Tue May 22 13:24:13 2012
New Revision: 1341466

URL: http://svn.apache.org/viewvc?rev=1341466&view=rev
Log:
KARAF-647 Bugfix: copleter should only show aliases if we are not in a subshell

Modified:
    karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/completer/CommandsCompleter.java

Modified: karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/completer/CommandsCompleter.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/completer/CommandsCompleter.java?rev=1341466&r1=1341465&r2=1341466&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/completer/CommandsCompleter.java (original)
+++ karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/completer/CommandsCompleter.java Tue May 22 13:24:13 2012
@@ -80,9 +80,12 @@ public class CommandsCompleter implement
             commands.clear();
             completers.clear();
 
-            // get command aliases
-            Set<String> aliases = this.getAliases();
-            completers.add(new StringsCompleter(aliases));
+            
+            if (subshell == null || subshell.length() == 0) {
+                // Add aliases if we are not in a subshell
+                Set<String> aliases = this.getAliases();
+                completers.add(new StringsCompleter(aliases));
+            }
 
             // add argument completers for each command
             for (String command : names) {