You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by gn...@apache.org on 2014/09/25 16:30:30 UTC
[2/2] git commit: [SSHD-354] SftpClient#write(String path) should
support the OpenMode flags as an argument
[SSHD-354] SftpClient#write(String path) should support the OpenMode flags as an argument
Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/b91da7d1
Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/b91da7d1
Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/b91da7d1
Branch: refs/heads/master
Commit: b91da7d133f6a062b622089a726c14c49c5ec738
Parents: b5b05d1
Author: Guillaume Nodet <gn...@apache.org>
Authored: Thu Sep 25 16:30:19 2014 +0200
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Thu Sep 25 16:30:19 2014 +0200
----------------------------------------------------------------------
.../main/java/org/apache/sshd/client/SftpClient.java | 4 ++++
.../org/apache/sshd/client/sftp/DefaultSftpClient.java | 12 ++++++++++--
2 files changed, 14 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/b91da7d1/sshd-core/src/main/java/org/apache/sshd/client/SftpClient.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/client/SftpClient.java b/sshd-core/src/main/java/org/apache/sshd/client/SftpClient.java
index 8e516e1..35b4260 100644
--- a/sshd-core/src/main/java/org/apache/sshd/client/SftpClient.java
+++ b/sshd-core/src/main/java/org/apache/sshd/client/SftpClient.java
@@ -183,6 +183,10 @@ public interface SftpClient {
InputStream read(String path) throws IOException;
+ InputStream read(String path, EnumSet<OpenMode> mode) throws IOException;
+
OutputStream write(String path) throws IOException;
+ OutputStream write(String path, EnumSet<OpenMode> mode) throws IOException;
+
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/b91da7d1/sshd-core/src/main/java/org/apache/sshd/client/sftp/DefaultSftpClient.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/client/sftp/DefaultSftpClient.java b/sshd-core/src/main/java/org/apache/sshd/client/sftp/DefaultSftpClient.java
index 4f4921b..9a945cf 100644
--- a/sshd-core/src/main/java/org/apache/sshd/client/sftp/DefaultSftpClient.java
+++ b/sshd-core/src/main/java/org/apache/sshd/client/sftp/DefaultSftpClient.java
@@ -640,11 +640,15 @@ public class DefaultSftpClient implements SftpClient {
}
public InputStream read(final String path) throws IOException {
+ return read(path, EnumSet.of(OpenMode.Read));
+ }
+
+ public InputStream read(final String path, final EnumSet<OpenMode> mode) throws IOException {
return new InputStream() {
byte[] buffer = new byte[32 * 1024];
int index = 0;
int available = 0;
- Handle handle = DefaultSftpClient.this.open(path, EnumSet.of(OpenMode.Read));
+ Handle handle = DefaultSftpClient.this.open(path, mode);
long offset;
@Override
public int read() throws IOException {
@@ -696,10 +700,14 @@ public class DefaultSftpClient implements SftpClient {
}
public OutputStream write(final String path) throws IOException {
+ return write(path, EnumSet.of(OpenMode.Write));
+ }
+
+ public OutputStream write(final String path, final EnumSet<OpenMode> mode) throws IOException {
return new OutputStream() {
byte[] buffer = new byte[32 * 1024];
int index = 0;
- Handle handle = DefaultSftpClient.this.open(path, EnumSet.of(OpenMode.Write));
+ Handle handle = DefaultSftpClient.this.open(path, mode);
long offset;
@Override
public void write(int b) throws IOException {