summaryrefslogtreecommitdiffstats
path: root/src/main/java/org/openslx/imagemaster/ftp
diff options
context:
space:
mode:
authorNils Schwabe2014-06-16 18:01:17 +0200
committerNils Schwabe2014-06-16 18:01:17 +0200
commitabe4422f8db9f3f762f9505d67765d2ffe4f7ad5 (patch)
tree52492ec8d628687323f88f4cb9e8c33afb2b5fd8 /src/main/java/org/openslx/imagemaster/ftp
parentAdd FtpUsers are now in sync with DB (diff)
downloadmasterserver-abe4422f8db9f3f762f9505d67765d2ffe4f7ad5.tar.gz
masterserver-abe4422f8db9f3f762f9505d67765d2ffe4f7ad5.tar.xz
masterserver-abe4422f8db9f3f762f9505d67765d2ffe4f7ad5.zip
Implement downloading functionality
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/ftp')
-rw-r--r--src/main/java/org/openslx/imagemaster/ftp/MasterFtpServer.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/main/java/org/openslx/imagemaster/ftp/MasterFtpServer.java b/src/main/java/org/openslx/imagemaster/ftp/MasterFtpServer.java
index 8ed64d6..3da37a0 100644
--- a/src/main/java/org/openslx/imagemaster/ftp/MasterFtpServer.java
+++ b/src/main/java/org/openslx/imagemaster/ftp/MasterFtpServer.java
@@ -260,8 +260,12 @@ public class MasterFtpServer implements Runnable
DbFtpUser.removeUserByName( username );
}
// remove his home dir
- File dir = new File( Globals.getPropertyString( Globals.PropString.FTPBASEDIR ) + "/" + username );
- Util.deleteFolder( dir );
+ try {
+ File dir = new File( Globals.getPropertyString( Globals.PropString.FTPBASEDIR ) + "/" + username );
+ Util.deleteFolder( dir );
+ } catch (Exception e) {
+ // don't care because it could be a downloading user
+ }
return true;
} catch ( FtpException e ) {
return false;