diff options
| author | Nils Schwabe | 2014-05-09 18:28:59 +0200 |
|---|---|---|
| committer | Nils Schwabe | 2014-05-09 18:28:59 +0200 |
| commit | d3a11c39d46f420d832393e10c40d58601a668c9 (patch) | |
| tree | eab7bba67200fe91e984946d1d963a94cdb3c7c4 /src/main/java/org/openslx/imagemaster/server/ApiServer.java | |
| parent | Forgot to commit some files. (diff) | |
| download | masterserver-d3a11c39d46f420d832393e10c40d58601a668c9.tar.gz masterserver-d3a11c39d46f420d832393e10c40d58601a668c9.tar.xz masterserver-d3a11c39d46f420d832393e10c40d58601a668c9.zip | |
Improve ImageProcessor functionallity (and added some regex)
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/server/ApiServer.java')
| -rw-r--r-- | src/main/java/org/openslx/imagemaster/server/ApiServer.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/main/java/org/openslx/imagemaster/server/ApiServer.java b/src/main/java/org/openslx/imagemaster/server/ApiServer.java index 8dd72f8..53ddc71 100644 --- a/src/main/java/org/openslx/imagemaster/server/ApiServer.java +++ b/src/main/java/org/openslx/imagemaster/server/ApiServer.java @@ -110,9 +110,11 @@ public class ApiServer return null; } - if ( !ImageProcessor.addImageDataToProcess( imageDescription, ftpCredentials.username ) ) { + try { + ImageProcessor.addImageDataToProcess( imageDescription, ftpCredentials.username ); + } catch (ImageDataException e) { App.ftpServer.removeUser( serverSessionId ); - throw new ImageDataException( ImageDataError.INVALID_DATA, "ImageData is not valid." ); + throw new ImageDataException( ImageDataError.INVALID_DATA, e.getMessage() ); } return ftpCredentials; |