You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ff...@apache.org on 2015/01/15 11:13:35 UTC
karaf git commit: [KARAF-3446]avoid Karaf client script logout
command throwing an exception
Repository: karaf
Updated Branches:
refs/heads/karaf-2.x 9ede5e4e7 -> d71c40bcb
[KARAF-3446]avoid Karaf client script logout command throwing an exception
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/d71c40bc
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/d71c40bc
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/d71c40bc
Branch: refs/heads/karaf-2.x
Commit: d71c40bcb540e149754e1507f04e51cc90cd9cf7
Parents: 9ede5e4
Author: Freeman Fang <fr...@gmail.com>
Authored: Thu Jan 15 18:13:11 2015 +0800
Committer: Freeman Fang <fr...@gmail.com>
Committed: Thu Jan 15 18:13:11 2015 +0800
----------------------------------------------------------------------
.../java/org/apache/karaf/shell/ssh/ShellCommandFactory.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/d71c40bc/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/ShellCommandFactory.java
----------------------------------------------------------------------
diff --git a/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/ShellCommandFactory.java b/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/ShellCommandFactory.java
index 2438060..43d3a49 100644
--- a/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/ShellCommandFactory.java
+++ b/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/ShellCommandFactory.java
@@ -29,6 +29,7 @@ import org.apache.felix.gogo.runtime.CommandNotFoundException;
import org.apache.felix.service.command.CommandProcessor;
import org.apache.felix.service.command.CommandSession;
import org.apache.felix.service.command.Converter;
+import org.apache.karaf.shell.console.CloseShellException;
import org.apache.karaf.shell.console.jline.Console;
import org.apache.karaf.jaas.modules.JaasHelper;
import org.apache.sshd.server.Command;
@@ -136,7 +137,7 @@ public class ShellCommandFactory implements CommandFactory {
boolean isCommandNotFound = "org.apache.felix.gogo.runtime.CommandNotFoundException".equals(t.getClass().getName());
if (isCommandNotFound) {
LOGGER.debug("Unknown command entered", t);
- } else {
+ } else if (!(t instanceof CloseShellException)) {
LOGGER.info("Exception caught while executing command", t);
}
commandSession.put(Console.LAST_EXCEPTION, t);
@@ -157,7 +158,7 @@ public class ShellCommandFactory implements CommandFactory {
t.printStackTrace(commandSession.getConsole());
commandSession.getConsole().print(Ansi.ansi().fg(Ansi.Color.DEFAULT).toString());
}
- else if (!(t instanceof CommandException) && !isCommandNotFound) {
+ else if (!(t instanceof CloseShellException) && !(t instanceof CommandException) && !isCommandNotFound) {
commandSession.getConsole().print(Ansi.ansi().fg(Ansi.Color.RED).toString());
commandSession.getConsole().println("Error executing command: "
+ (t.getMessage() != null ? t.getMessage() : t.getClass().getName()));