Repository: karaf Updated Branches: refs/heads/master d3b6a863d -> f1220ccb7
[KARAF-2981] Force immediate stop of the SSH server Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/f1220ccb Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/f1220ccb Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/f1220ccb Branch: refs/heads/master Commit: f1220ccb77f0669ff49904f0e1ad1271a2fa2c63 Parents: d3b6a86 Author: Jean-Baptiste Onofré <[email protected]> Authored: Tue Aug 5 14:54:03 2014 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Tue Aug 5 14:54:03 2014 +0200 ---------------------------------------------------------------------- shell/ssh/src/main/java/org/apache/karaf/shell/ssh/Activator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/f1220ccb/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/Activator.java ---------------------------------------------------------------------- diff --git a/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/Activator.java b/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/Activator.java index ac5185d..824b4b8 100644 --- a/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/Activator.java +++ b/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/Activator.java @@ -115,7 +115,7 @@ public class Activator extends BaseActivator implements ManagedService { } if (server != null) { try { - server.stop(); + server.stop(true); } catch (InterruptedException e) { LOGGER.warn("Exception caught while stopping SSH server", e); }
