[server] Implement image download from master

1 files changed, 10 insertions, 2 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 df845fdc..add5d13b 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
@@ -513,17 +513,25 @@ public class ServerHandler implements SatelliteServer.Iface {
 		}
 		// Known by master server; now update/write to DB
 		try {
-			DbImage.writeBaseImage(user, imagePublishData);
+			if (imagePublishData.owner == null) {
+				imagePublishData.owner = imagePublishData.uploader;
+			}
+			LOGGER.debug("Writing user " + imagePublishData.owner);
+			DbUser.writeUserOnReplication(imagePublishData.owner);
+			DbImage.writeBaseImage(imagePublishData);
 		} catch (SQLException e) {
 			throw new TInvocationException(InvocationError.INTERNAL_SERVER_ERROR,
 					"Could not write to local DB");
 		}
+		imagePublishData.uploader = user;
+		LOGGER.debug("Setting uploader to " + user);
 		return SyncTransferHandler.requestImageDownload(userToken, imagePublishData);
 	}
 
 	@Override
 	public String publishImageVersion(String userToken, String imageVersionId)
-			throws TAuthorizationException, TNotFoundException, TInvocationException, TTransferRejectedException {
+			throws TAuthorizationException, TNotFoundException, TInvocationException,
+			TTransferRejectedException {
 		UserInfo user = SessionManager.getOrFail(userToken);
 		User.canCreateImageOrFail(user);
 		LocalImageVersion imgVersion = null;