[server] Implement image download from master

1 files changed, 10 insertions, 3 deletions

diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/IncomingDataTransfer.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/IncomingDataTransfer.java
index 3530a8fd..5c7621a9 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/IncomingDataTransfer.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/IncomingDataTransfer.java
@@ -94,7 +94,7 @@ public class IncomingDataTransfer extends IncomingTransferBase {
 		idr.setUpdaterId(publishData.uploader.userId);
 		idr.setUpdateTime(publishData.createTime);
 		idr.setVirtId(publishData.virtId);
-		this.owner = publishData.owner;
+		this.owner = publishData.uploader;
 		this.image = idr;
 		this.machineDescription = ThriftUtil.unwrapByteBuffer(transferInfo.machineDescription);
 		this.masterTransferInfo = transferInfo;
@@ -214,7 +214,8 @@ public class IncomingDataTransfer extends IncomingTransferBase {
 		// Now insert meta data into DB
 		try {
 			synchronized (versionWrittenToDb) {
-				DbImage.createImageVersion(image.imageBaseId, getId(), owner, getFileSize(), relPath,
+				LOGGER.debug("Owner id " + owner);
+				DbImage.createImageVersion(image.imageBaseId, getVersionId(), owner, getFileSize(), relPath,
 						versionSettings, getChunks(), machineDescription);
 				versionWrittenToDb.set(true);
 			}
@@ -228,10 +229,16 @@ public class IncomingDataTransfer extends IncomingTransferBase {
 		return true;
 	}
 
+	private String getVersionId() {
+		if (masterTransferInfo == null)
+			return getId();
+		return image.latestVersionId;
+	}
+
 	@Override
 	public synchronized void cancel() {
-		super.cancel();
 		if (!isRepairUpload() && getTmpFileName().exists()) {
+			super.cancel();
 			FileSystem.deleteAsync(getTmpFileName());
 		}
 	}