summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShawn O. Pearce <sop@google.com>2011-04-21 13:53:06 -0700
committerShawn O. Pearce <sop@google.com>2011-04-21 14:00:39 -0700
commitd2eaefa18a99ae4f246e86de61763755841c30ad (patch)
tree55f65e9f4670339395efce0e6521849005ea46ea
parent1812e59e1c0a1470b91c6227837ef3d6f0d4e57e (diff)
Update MINA SSHD to 0.5.1-r1095809
This fixes the keepalive@jsch.com error seen by some sites. Change-Id: I19917d91ddeb2ab55119c71ea60e90d2034ab460 Signed-off-by: Shawn O. Pearce <sop@google.com>
-rw-r--r--gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshDaemon.java9
-rw-r--r--pom.xml2
2 files changed, 9 insertions, 2 deletions
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshDaemon.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshDaemon.java
index dee55a5922..770eebb010 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshDaemon.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshDaemon.java
@@ -42,6 +42,7 @@ import org.apache.sshd.common.Compression;
import org.apache.sshd.common.KeyExchange;
import org.apache.sshd.common.KeyPairProvider;
import org.apache.sshd.common.NamedFactory;
+import org.apache.sshd.common.Session;
import org.apache.sshd.common.Signature;
import org.apache.sshd.common.cipher.AES128CBC;
import org.apache.sshd.common.cipher.AES192CBC;
@@ -517,9 +518,15 @@ public class SshDaemon extends SshServer implements SshInfo, LifecycleListener {
private void initFileSystemFactory() {
setFileSystemFactory(new FileSystemFactory() {
@Override
- public FileSystemView createFileSystemView(String userName) {
+ public FileSystemView createFileSystemView(Session session)
+ throws IOException {
return new FileSystemView() {
@Override
+ public SshFile getFile(SshFile baseDir, String file) {
+ return null;
+ }
+
+ @Override
public SshFile getFile(String file) {
return null;
}};
diff --git a/pom.xml b/pom.xml
index 8f0df57b55..161706dbdd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -479,7 +479,7 @@ limitations under the License.
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-core</artifactId>
- <version>0.5.1-r1033260</version>
+ <version>0.5.1-r1095809</version>
</dependency>
<dependency>