felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r831271 - in /felix/trunk/karaf: pom.xml shell/ssh/src/main/java/org/apache/felix/karaf/shell/ssh/SshTerminal.java
Date Fri, 30 Oct 2009 11:38:47 GMT
Author: gnodet
Date: Fri Oct 30 11:38:47 2009
New Revision: 831271

URL: http://svn.apache.org/viewvc?rev=831271&view=rev
Log:
FELIX-1642: osgi:shutdown just hang when using karaf-client.jar

Modified:
    felix/trunk/karaf/pom.xml
    felix/trunk/karaf/shell/ssh/src/main/java/org/apache/felix/karaf/shell/ssh/SshTerminal.java

Modified: felix/trunk/karaf/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/pom.xml?rev=831271&r1=831270&r2=831271&view=diff
==============================================================================
--- felix/trunk/karaf/pom.xml (original)
+++ felix/trunk/karaf/pom.xml Fri Oct 30 11:38:47 2009
@@ -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>

Modified: felix/trunk/karaf/shell/ssh/src/main/java/org/apache/felix/karaf/shell/ssh/SshTerminal.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/ssh/src/main/java/org/apache/felix/karaf/shell/ssh/SshTerminal.java?rev=831271&r1=831270&r2=831271&view=diff
==============================================================================
--- felix/trunk/karaf/shell/ssh/src/main/java/org/apache/felix/karaf/shell/ssh/SshTerminal.java
(original)
+++ felix/trunk/karaf/shell/ssh/src/main/java/org/apache/felix/karaf/shell/ssh/SshTerminal.java
Fri Oct 30 11:38:47 2009
@@ -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 {



Mime
View raw message