diff options
| author | Simon Rettberg | 2017-07-25 14:02:19 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2017-07-25 14:02:19 +0200 |
| commit | 68fa25822e2a71573c12ba8c265663ad4b46015f (patch) | |
| tree | 62c69429c39dd777d2cbbe196523967410f04a18 /dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java | |
| parent | [client] Allow filtering lecture list for exams (diff) | |
| download | tutor-module-68fa25822e2a71573c12ba8c265663ad4b46015f.tar.gz tutor-module-68fa25822e2a71573c12ba8c265663ad4b46015f.tar.xz tutor-module-68fa25822e2a71573c12ba8c265663ad4b46015f.zip | |
[server] Fix call order in setImageVersionExpiry
Fixes #3179
Diffstat (limited to 'dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java')
| -rw-r--r-- | dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java index f9ab5a54..df127736 100644 --- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java +++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java @@ -489,15 +489,14 @@ public class ServerHandler implements SatelliteServer.Iface { errorMessage = "File has invalid path on server"; } else if (!srcFile.canRead()) { errorMessage = "File missing on server"; - } - if (srcFile.length() != localImageData.fileSize) { + } else if (srcFile.length() != localImageData.fileSize) { errorMessage = "File corrupted on server"; } try { if (errorMessage == null) { - DbImage.markValid(true, false, localImageData); DbImage.setDeletion(DeleteState.KEEP, localImageData.imageVersionId); DbImage.setExpireDate(localImageData.imageVersionId, expireTime); + DbImage.markValid(true, false, localImageData); } else { DbImage.markValid(false, false, localImageData); throw new TInvocationException(InvocationError.INTERNAL_SERVER_ERROR, errorMessage); |