diff options
| author | Simon Rettberg | 2017-01-13 13:20:05 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2017-01-13 13:20:05 +0100 |
| commit | b6b5744181840eba9d0f2c77946bd450cf5a0219 (patch) | |
| tree | d135b38210da63a288efeb4bf226a848e7757772 /dozentenmodulserver | |
| parent | [server] Get rid of imagebase entries without imageversion a bit faster (diff) | |
| download | tutor-module-b6b5744181840eba9d0f2c77946bd450cf5a0219.tar.gz tutor-module-b6b5744181840eba9d0f2c77946bd450cf5a0219.tar.xz tutor-module-b6b5744181840eba9d0f2c77946bd450cf5a0219.zip | |
[server] Reset delete-state to KEEP on setExpiryDate()
Diffstat (limited to 'dozentenmodulserver')
| -rw-r--r-- | dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java | 3 |
1 files changed, 2 insertions, 1 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 94d25297..c405714b 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 @@ -465,7 +465,7 @@ public class ServerHandler implements SatelliteServer.Iface { public void setImageVersionExpiry(String userToken, String imageVersionId, long expireTime) throws TAuthorizationException, TNotFoundException, TInvocationException, TInvalidDateParam { long now = Util.unixTime(); - if (expireTime > now + 3 * 365 * 86400) + if (expireTime > now + 3 * RuntimeConfig.getMaxImageValiditySeconds()) throw new TInvalidDateParam(DateParamError.TOO_HIGH, "Expire date too far in the future"); if (expireTime < now - 365 * 86400) throw new TInvalidDateParam(DateParamError.TOO_LOW, "Expire date too far in the past"); @@ -490,6 +490,7 @@ public class ServerHandler implements SatelliteServer.Iface { try { if (errorMessage == null) { DbImage.markValid(true, false, localImageData); + DbImage.setDeletion(DeleteState.KEEP, localImageData.imageVersionId); DbImage.setExpireDate(localImageData.imageVersionId, expireTime); } else { DbImage.markValid(false, false, localImageData); |