From 68fa25822e2a71573c12ba8c265663ad4b46015f Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 25 Jul 2017 14:02:19 +0200
Subject: [server] Fix call order in setImageVersionExpiry

Fixes #3179
---
 .../src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java     | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'dozentenmodulserver/src/main/java')

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);
-- 
cgit v1.2.3-55-g7522