diff options
| author | Michael Petretti | 2014-07-07 17:26:48 +0200 |
|---|---|---|
| committer | Michael Petretti | 2014-07-07 17:26:48 +0200 |
| commit | 17426b6d50ba122dfe088d25f6f8eb162b2d2b27 (patch) | |
| tree | cb3aa4a6ecccb5f592c86dec25370a763c95de1a /src/main/java/org/openslx/satellitedaemon/ftp/FtpDownloadWorker.java | |
| parent | In the middle of Debuging and Testing. (diff) | |
| parent | Added TODOs (diff) | |
| download | satellite-daemon-17426b6d50ba122dfe088d25f6f8eb162b2d2b27.tar.gz satellite-daemon-17426b6d50ba122dfe088d25f6f8eb162b2d2b27.tar.xz satellite-daemon-17426b6d50ba122dfe088d25f6f8eb162b2d2b27.zip | |
Merge branch 'master' of git.openslx.org:bwlp/satellite-daemon
Conflicts:
src/main/java/org/openslx/satellitedaemon/ftp/FtpUploadWorker.java
Diffstat (limited to 'src/main/java/org/openslx/satellitedaemon/ftp/FtpDownloadWorker.java')
| -rw-r--r-- | src/main/java/org/openslx/satellitedaemon/ftp/FtpDownloadWorker.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/main/java/org/openslx/satellitedaemon/ftp/FtpDownloadWorker.java b/src/main/java/org/openslx/satellitedaemon/ftp/FtpDownloadWorker.java index 76f03cf..d315735 100644 --- a/src/main/java/org/openslx/satellitedaemon/ftp/FtpDownloadWorker.java +++ b/src/main/java/org/openslx/satellitedaemon/ftp/FtpDownloadWorker.java @@ -22,6 +22,8 @@ import org.openslx.satellitedaemon.Globals.PropInt; import org.openslx.satellitedaemon.Globals.PropString; import org.openslx.satellitedaemon.db.DbImage; +// TODO: Pretty much the same todos as in the uploader apply here + public class FtpDownloadWorker implements Runnable { private static Logger log = Logger.getLogger( FtpUploadWorker.class ); @@ -118,8 +120,8 @@ public class FtpDownloadWorker implements Runnable try { Thread.sleep( 5 * 60 * 1000 ); } catch ( InterruptedException e ) { - log.error( "FtpUploadWorker: Sleep interrupted" ); - e.printStackTrace(); + Thread.currentThread().interrupt(); + return; } } |