diff options
| author | Simon Rettberg | 2015-10-02 17:08:54 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2015-10-02 17:08:54 +0200 |
| commit | 17f8f4cb27485b4bd3d1b5b5d57e45fa5ecfda86 (patch) | |
| tree | b6597e1da24d3ea0d58d14dbe14cacc443d687b4 | |
| parent | Update thrift API with optional options (diff) | |
| download | master-sync-shared-17f8f4cb27485b4bd3d1b5b5d57e45fa5ecfda86.tar.gz master-sync-shared-17f8f4cb27485b4bd3d1b5b5d57e45fa5ecfda86.tar.xz master-sync-shared-17f8f4cb27485b4bd3d1b5b5d57e45fa5ecfda86.zip | |
Update comments/debug messages
| -rw-r--r-- | src/main/java/org/openslx/filetransfer/Transfer.java | 8 | ||||
| -rw-r--r-- | src/main/java/org/openslx/thrifthelper/TransferStatusWrapper.java | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/main/java/org/openslx/filetransfer/Transfer.java b/src/main/java/org/openslx/filetransfer/Transfer.java index bc7837f..f952bdc 100644 --- a/src/main/java/org/openslx/filetransfer/Transfer.java +++ b/src/main/java/org/openslx/filetransfer/Transfer.java @@ -170,10 +170,10 @@ public abstract class Transfer } } catch ( SocketTimeoutException ste ) { sendErrorCode( "timeout" ); - this.close( "Socket Timeout occured in readMetaData." ); + this.close( "Socket Timeout occured in readMetaData. " + ERROR ); return null; } catch ( Exception e ) { - this.close( "Exception occured in readMetaData: " + e.toString() ); + this.close( "Exception occured in readMetaData: " + e.toString() + " " + ERROR ); return null; } return new MetaData( entries ); @@ -218,12 +218,12 @@ public abstract class Transfer { synchronized ( transferSocket ) { try { - transferSocket.shutdownInput(); + transferSocket.shutdownOutput(); } catch ( Exception e ) { // Silence } try { - transferSocket.shutdownOutput(); + transferSocket.shutdownInput(); } catch ( Exception e ) { // Silence } diff --git a/src/main/java/org/openslx/thrifthelper/TransferStatusWrapper.java b/src/main/java/org/openslx/thrifthelper/TransferStatusWrapper.java index 5a28461..144b3e0 100644 --- a/src/main/java/org/openslx/thrifthelper/TransferStatusWrapper.java +++ b/src/main/java/org/openslx/thrifthelper/TransferStatusWrapper.java @@ -4,10 +4,10 @@ public class TransferStatusWrapper { public static enum BlockStatus { - COMPLETE, MISSING, UPLOADING, QUEUED_FOR_COPYING, COPYING; + COMPLETE, MISSING, UPLOADING, QUEUED_FOR_COPYING, COPYING, HASHING; } - // 0 = complete, 1 = missing, 2 = uploading, 3 = queued for copying, 4 = copying + // 0 = complete, 1 = missing, 2 = uploading, 3 = queued for copying, 4 = copying, 5 = hashing private byte[] blocks = null; public TransferStatusWrapper(byte[] blocks) { |