diff options
| author | Björn Hagemeister | 2014-07-10 15:25:20 +0200 |
|---|---|---|
| committer | Björn Hagemeister | 2014-07-10 15:25:20 +0200 |
| commit | cc4c0db9997a2e35e87c9a64eeeff12bfff5e32a (patch) | |
| tree | b2b089e6fb08afae59513ecf84cd5707d07a2df7 /src/main/java/org/openslx/filetransfer/Downloader.java | |
| parent | Finished implementing exception handling. (diff) | |
| download | master-sync-shared-cc4c0db9997a2e35e87c9a64eeeff12bfff5e32a.tar.gz master-sync-shared-cc4c0db9997a2e35e87c9a64eeeff12bfff5e32a.tar.xz master-sync-shared-cc4c0db9997a2e35e87c9a64eeeff12bfff5e32a.zip | |
Checking if socket is null before closing.
Diffstat (limited to 'src/main/java/org/openslx/filetransfer/Downloader.java')
| -rw-r--r-- | src/main/java/org/openslx/filetransfer/Downloader.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/main/java/org/openslx/filetransfer/Downloader.java b/src/main/java/org/openslx/filetransfer/Downloader.java index ffa7751..2d99c2a 100644 --- a/src/main/java/org/openslx/filetransfer/Downloader.java +++ b/src/main/java/org/openslx/filetransfer/Downloader.java @@ -290,6 +290,7 @@ public class Downloader this.close(); } catch ( Exception e ) { e.printStackTrace(); + this.close(); return false; } return true; @@ -330,6 +331,7 @@ public class Downloader e.printStackTrace(); log.info( "Reading RANGE " + getStartOfRange() + ":" + getEndOfRange() + " of file failed..." ); + this.close(); return false; } finally { if (file != null) { @@ -372,7 +374,10 @@ public class Downloader public void close() { try { - this.satelliteSocket.close(); + if (satelliteSocket != null) { + this.satelliteSocket.close(); + satelliteSocket = null; + } if (dataFromServer != null) dataFromServer.close(); if (dataToServer != null) dataToServer.close(); } catch ( IOException e ) { |