FELIX-1642: osgi:shutdown just hang when using karaf-client.jar
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@831271 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/karaf/pom.xml b/karaf/pom.xml
index 171466a..5a2d3e5 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -100,7 +100,7 @@
<servlet.api.version>2.5</servlet.api.version>
<spring.osgi.version>1.2.0</spring.osgi.version>
<spring.version>2.5.6.SEC01</spring.version>
- <sshd.version>0.2.0</sshd.version>
+ <sshd.version>0.3.0-SNAPSHOT</sshd.version>
<osgi.jmx.version>4.2.0.200907080519</osgi.jmx.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/karaf/shell/ssh/src/main/java/org/apache/felix/karaf/shell/ssh/SshTerminal.java b/karaf/shell/ssh/src/main/java/org/apache/felix/karaf/shell/ssh/SshTerminal.java
index b8235af..57e4db6 100644
--- a/karaf/shell/ssh/src/main/java/org/apache/felix/karaf/shell/ssh/SshTerminal.java
+++ b/karaf/shell/ssh/src/main/java/org/apache/felix/karaf/shell/ssh/SshTerminal.java
@@ -24,6 +24,7 @@
import jline.Terminal;
import org.apache.sshd.server.ShellFactory;
+import org.apache.sshd.server.Signal;
public class SshTerminal extends Terminal implements ShellFactory.SignalListener {
@@ -88,8 +89,7 @@
public void disableEcho() {
}
- public void signal(int signal) {
-
+ public void signal(Signal signal) {
}
public int readVirtualKey(InputStream in) throws IOException {