diff options
author | Simon Rettberg | 2015-07-21 17:07:43 +0200 |
---|---|---|
committer | Simon Rettberg | 2015-07-21 17:07:43 +0200 |
commit | 25f81d3592d103a6b83516d76d2e767b8c2b15b3 (patch) | |
tree | f58e6a85a4911f326c0be8cdf9518936dce14ec0 /src/main/java/org/openslx/filetransfer/Transfer.java | |
parent | Add contains method to FileRange class (diff) | |
download | master-sync-shared-25f81d3592d103a6b83516d76d2e767b8c2b15b3.tar.gz master-sync-shared-25f81d3592d103a6b83516d76d2e767b8c2b15b3.tar.xz master-sync-shared-25f81d3592d103a6b83516d76d2e767b8c2b15b3.zip |
Minor changes to file transfer classes
Diffstat (limited to 'src/main/java/org/openslx/filetransfer/Transfer.java')
-rw-r--r-- | src/main/java/org/openslx/filetransfer/Transfer.java | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/main/java/org/openslx/filetransfer/Transfer.java b/src/main/java/org/openslx/filetransfer/Transfer.java index 9bf2250..79a0242 100644 --- a/src/main/java/org/openslx/filetransfer/Transfer.java +++ b/src/main/java/org/openslx/filetransfer/Transfer.java @@ -169,13 +169,11 @@ public abstract class Transfer } } } catch ( SocketTimeoutException ste ) { - ste.printStackTrace(); sendErrorCode( "timeout" ); this.close( "Socket Timeout occured in readMetaData." ); return null; } catch ( Exception e ) { - e.printStackTrace(); - this.close( e.toString() ); + this.close( "Exception occured in readMetaData: " + e.toString() ); return null; } return new MetaData( entries ); @@ -219,13 +217,15 @@ public abstract class Transfer public void cancel() { synchronized ( transferSocket ) { - if ( isValid() ) { - try { - transferSocket.shutdownInput(); - transferSocket.shutdownOutput(); - } catch ( Exception e ) { - // Silence - } + try { + transferSocket.shutdownInput(); + } catch ( Exception e ) { + // Silence + } + try { + transferSocket.shutdownOutput(); + } catch ( Exception e ) { + // Silence } } } |