diff options
| author | Simon Rettberg | 2015-07-20 12:32:39 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2015-07-20 12:32:39 +0200 |
| commit | 06af3543b39316330555db2baaf305711d943973 (patch) | |
| tree | 732203d7cb61b5da681ed14362d6a2e728da8862 /src/main/java/org/openslx/filetransfer/Uploader.java | |
| parent | Add TransferState to thrift api (diff) | |
| download | master-sync-shared-06af3543b39316330555db2baaf305711d943973.tar.gz master-sync-shared-06af3543b39316330555db2baaf305711d943973.tar.xz master-sync-shared-06af3543b39316330555db2baaf305711d943973.zip | |
Thrift API changes, add configurable timeout to file transfer classes
Diffstat (limited to 'src/main/java/org/openslx/filetransfer/Uploader.java')
| -rw-r--r-- | src/main/java/org/openslx/filetransfer/Uploader.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/org/openslx/filetransfer/Uploader.java b/src/main/java/org/openslx/filetransfer/Uploader.java index 748b1e2..92da8ea 100644 --- a/src/main/java/org/openslx/filetransfer/Uploader.java +++ b/src/main/java/org/openslx/filetransfer/Uploader.java @@ -24,9 +24,9 @@ public class Uploader extends Transfer * @param context ssl context for establishing a secure connection * @throws IOException */ - public Uploader( String host, int port, SSLContext context, String token ) throws IOException + public Uploader( String host, int port, int readTimeoutMs, SSLContext context, String token ) throws IOException { - super( host, port, context, log ); + super( host, port, readTimeoutMs, context, log ); outStream.writeByte( 'U' ); if ( !sendToken( token ) || !sendEndOfMeta() ) throw new IOException( "Sending token failed" ); @@ -141,7 +141,7 @@ public class Uploader extends Transfer } } } finally { - Transfer.safeClose( file ); + Transfer.safeClose( file, transferSocket ); } return true; } |