diff options
Diffstat (limited to 'dozentenmodulserver/src/main/java')
| -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); |