summaryrefslogtreecommitdiffstats
path: root/src/main/java/org/openslx/imagemaster/server/ApiServer.java
diff options
context:
space:
mode:
authorNils Schwabe2014-04-22 19:04:01 +0200
committerNils Schwabe2014-04-22 19:04:01 +0200
commit59b4035f8c9d9db72f389e31c2941316e20e29f0 (patch)
treeeabe180ab584ef26c0ed8341d358b67ac44d5586 /src/main/java/org/openslx/imagemaster/server/ApiServer.java
parentignore ftp.properties (diff)
downloadmasterserver-59b4035f8c9d9db72f389e31c2941316e20e29f0.tar.gz
masterserver-59b4035f8c9d9db72f389e31c2941316e20e29f0.tar.xz
masterserver-59b4035f8c9d9db72f389e31c2941316e20e29f0.zip
Fixed something
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/server/ApiServer.java')
-rw-r--r--src/main/java/org/openslx/imagemaster/server/ApiServer.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/main/java/org/openslx/imagemaster/server/ApiServer.java b/src/main/java/org/openslx/imagemaster/server/ApiServer.java
index 1fcfa49..df0aa3a 100644
--- a/src/main/java/org/openslx/imagemaster/server/ApiServer.java
+++ b/src/main/java/org/openslx/imagemaster/server/ApiServer.java
@@ -97,6 +97,11 @@ public class ApiServer {
// create new user
FtpCredentials ftpCredentials = Globals.ftpServer.addUser(serverSessionId);
+ if (ftpCredentials == null) {
+ log.error("Could not create ftp credentials");
+ return null;
+ }
+
if (!ImageProcessor.addImageDataToProcess(imageDescription, ftpCredentials.username)) {
Globals.ftpServer.removeUser(serverSessionId);
throw new TException("ImageData is not valid.");