Merge pull request #150 from dkocher/master

Change handle to byte[]. Fix interoperability issue with Tectia SSH Serv...
hierynomus · Sep 18, 2014 · af0d873 · af0d873
2 parents ef5a54d + d37b54b
commit af0d873
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/src/main/java/net/schmizz/sshj/sftp/RemoteDirectory.java b/src/main/java/net/schmizz/sshj/sftp/RemoteDirectory.java
@@ -25,7 +25,7 @@
 public class RemoteDirectory
         extends RemoteResource {
 
-    public RemoteDirectory(Requester requester, String path, String handle) {
+    public RemoteDirectory(Requester requester, String path, byte[] handle) {
         super(requester, path, handle);
     }
 

diff --git a/src/main/java/net/schmizz/sshj/sftp/RemoteFile.java b/src/main/java/net/schmizz/sshj/sftp/RemoteFile.java
@@ -29,7 +29,7 @@
 public class RemoteFile
         extends RemoteResource {
 
-    public RemoteFile(Requester requester, String path, String handle) {
+    public RemoteFile(Requester requester, String path, byte[] handle) {
         super(requester, path, handle);
     }
 
@@ -108,7 +108,7 @@ public int getOutgoingPacketOverhead() {
         return 1 + // packet type
                 4 + // request id
                 4 + // next length
-                handle.length() + // next
+                handle.length + // next
                 8 + // file offset
                 4 + // data length
                 4; // packet length

diff --git a/src/main/java/net/schmizz/sshj/sftp/RemoteResource.java b/src/main/java/net/schmizz/sshj/sftp/RemoteResource.java
@@ -30,9 +30,9 @@ public abstract class RemoteResource
 
     protected final Requester requester;
     protected final String path;
-    protected final String handle;
+    protected final byte[] handle;
 
-    protected RemoteResource(Requester requester, String path, String handle) {
+    protected RemoteResource(Requester requester, String path, byte[] handle) {
         this.requester = requester;
         this.path = path;
         this.handle = handle;

diff --git a/src/main/java/net/schmizz/sshj/sftp/SFTPEngine.java b/src/main/java/net/schmizz/sshj/sftp/SFTPEngine.java
@@ -132,9 +132,9 @@ private Response doRequest(Request req)
 
     public RemoteFile open(String path, Set<OpenMode> modes, FileAttributes fa)
             throws IOException {
-        final String handle = doRequest(
+        final byte[] handle = doRequest(
                 newRequest(PacketType.OPEN).putString(path).putUInt32(OpenMode.toMask(modes)).putFileAttributes(fa)
-        ).ensurePacketTypeIs(PacketType.HANDLE).readString();
+        ).ensurePacketTypeIs(PacketType.HANDLE).readBytes();
         return new RemoteFile(this, path, handle);
     }
 
@@ -150,9 +150,9 @@ public RemoteFile open(String filename)
 
     public RemoteDirectory openDir(String path)
             throws IOException {
-        final String handle = doRequest(
+        final byte[] handle = doRequest(
                 newRequest(PacketType.OPENDIR).putString(path)
-        ).ensurePacketTypeIs(PacketType.HANDLE).readString();
+        ).ensurePacketTypeIs(PacketType.HANDLE).readBytes();
         return new RemoteDirectory(this, path, handle);
     }