summaryrefslogtreecommitdiffstats
path: root/src/main/java/org/openslx/imagemaster/server
diff options
context:
space:
mode:
authorNils Schwabe2014-04-25 16:20:50 +0200
committerNils Schwabe2014-04-25 16:20:50 +0200
commitb9878eda35e354d16ce732a57b7fabebb46c1a46 (patch)
treec0d9c7ad51025affb1480e676f3f37841c3bcd7b /src/main/java/org/openslx/imagemaster/server
parentMerge branch 'master' of git.openslx.org:bwlp/masterserver (diff)
downloadmasterserver-b9878eda35e354d16ce732a57b7fabebb46c1a46.tar.gz
masterserver-b9878eda35e354d16ce732a57b7fabebb46c1a46.tar.xz
masterserver-b9878eda35e354d16ce732a57b7fabebb46c1a46.zip
Add remove image from process list (when user gets deleted after timeout)
Fix problems with timeout user deleting
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/server')
-rw-r--r--src/main/java/org/openslx/imagemaster/server/ApiServer.java6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/main/java/org/openslx/imagemaster/server/ApiServer.java b/src/main/java/org/openslx/imagemaster/server/ApiServer.java
index 7479fd3..31bb712 100644
--- a/src/main/java/org/openslx/imagemaster/server/ApiServer.java
+++ b/src/main/java/org/openslx/imagemaster/server/ApiServer.java
@@ -191,13 +191,11 @@ public class ApiServer
log.info( username + " is done with upload" );
- // remove user that is not needed anymore
- App.ftpServer.removeUser( username );
- log.info( "Removed user: " + username );
-
ImageProcessor.processImageAfterUpload( username, list[0].getName() );
+ // remove user that is not needed anymore
App.ftpServer.removeUser( serverSessionId );
+ log.info( "Removed user: " + username );
return true;
}