Mirrors/sshj
1
0
Fork 0
mirror of https://github.com/hierynomus/sshj.git synced 2025-12-08 16:18:05 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

don't close underlying RemoteFile when closing streams of that file - reverts f34667521d

Browse Source
This commit is contained in:
shikhar
2014-06-24 14:20:04 +05:30
parent 0a3ad4f68f
commit 0875417dde
1 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/net/schmizz/sshj/sftp/RemoteFile.java
View File

@@ -15,6 +15,10 @@
*/ */
package net.schmizz.sshj.sftp; package net.schmizz.sshj.sftp;
import net.schmizz.concurrent.Promise;
import net.schmizz.sshj.common.Buffer;
import net.schmizz.sshj.sftp.Response.StatusCode;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
@@ -22,10 +26,6 @@ import java.util.LinkedList;
import java.util.Queue; import java.util.Queue;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import net.schmizz.concurrent.Promise;
import net.schmizz.sshj.common.Buffer;
import net.schmizz.sshj.sftp.Response.StatusCode;
public class RemoteFile public class RemoteFile
extends RemoteResource { extends RemoteResource {
@@ -62,7 +62,8 @@ public class RemoteFile
return requester.request(newRequest(PacketType.READ).putUInt64(fileOffset).putUInt32(len)); return requester.request(newRequest(PacketType.READ).putUInt64(fileOffset).putUInt32(len));
} }
protected int checkReadResponse(Response res, byte[] to, int offset) throws Buffer.BufferException, SFTPException { protected int checkReadResponse(Response res, byte[] to, int offset)
throws Buffer.BufferException, SFTPException {
switch (res.getType()) { switch (res.getType()) {
case DATA: case DATA:
int recvLen = res.readUInt32AsInt(); int recvLen = res.readUInt32AsInt();
@@ -166,8 +167,6 @@ public class RemoteFile
public void close() public void close()
throws IOException { throws IOException {
flush(); flush();
// Close handle
RemoteFile.this.close();
} }
} }
@@ -256,7 +255,8 @@ public class RemoteFile
} }
@Override @Override
public void close() throws IOException { public void close()
throws IOException {
while (!unconfirmedReads.isEmpty()) { while (!unconfirmedReads.isEmpty()) {
final Response res = unconfirmedReads.remove().retrieve( final Response res = unconfirmedReads.remove().retrieve(
requester.getTimeoutMs(), TimeUnit.MILLISECONDS); requester.getTimeoutMs(), TimeUnit.MILLISECONDS);
@@ -271,8 +271,6 @@ public class RemoteFile
throw new SFTPException("Unexpected packet: " + res.getType()); throw new SFTPException("Unexpected packet: " + res.getType());
} }
} }
// Close handle
RemoteFile.this.close();
} }
} }
} }