diff options
| author | Simon Rettberg | 2016-04-13 18:38:47 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2016-04-13 18:38:47 +0200 |
| commit | 34ca2905c38d17bbded01cf7497eca790e760a39 (patch) | |
| tree | 4dbaff08d7f88d48e685bd514b907c8d77571f16 /src/main/java/org/openslx/filetransfer/Transfer.java | |
| parent | remove ruleId from NetRule struct (diff) | |
| download | master-sync-shared-34ca2905c38d17bbded01cf7497eca790e760a39.tar.gz master-sync-shared-34ca2905c38d17bbded01cf7497eca790e760a39.tar.xz master-sync-shared-34ca2905c38d17bbded01cf7497eca790e760a39.zip | |
Preparations/changes for global image sync
Diffstat (limited to 'src/main/java/org/openslx/filetransfer/Transfer.java')
| -rw-r--r-- | src/main/java/org/openslx/filetransfer/Transfer.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/main/java/org/openslx/filetransfer/Transfer.java b/src/main/java/org/openslx/filetransfer/Transfer.java index f952bdc..cf9b475 100644 --- a/src/main/java/org/openslx/filetransfer/Transfer.java +++ b/src/main/java/org/openslx/filetransfer/Transfer.java @@ -110,7 +110,14 @@ public abstract class Transfer return true; } - public boolean sendDone() + public void sendDoneAndClose() + { + sendDone(); + sendEndOfMeta(); + close( "Transfer finished" ); + } + + protected boolean sendDone() { try { sendKeyValuePair( "DONE", "" ); @@ -202,7 +209,6 @@ public abstract class Transfer sendErrorCode( error ); if ( callback != null ) callback.uploadError( error ); - log.info( error ); } synchronized ( transferSocket ) { safeClose( dataFromServer, outStream, transferSocket ); |