diff options
Diffstat (limited to 'dozentenmodulserver/src/main/java/org')
2 files changed, 1 insertions, 7 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 0276e0cd..3530a8fd 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 @@ -22,7 +22,6 @@ import org.openslx.bwlp.thrift.iface.ImagePublishData; import org.openslx.bwlp.thrift.iface.ImageVersionWrite; import org.openslx.bwlp.thrift.iface.TransferInformation; import org.openslx.bwlp.thrift.iface.TransferState; -import org.openslx.bwlp.thrift.iface.TransferStatus; import org.openslx.bwlp.thrift.iface.UserInfo; import org.openslx.filetransfer.Downloader; import org.openslx.filetransfer.util.FileChunk; @@ -250,10 +249,6 @@ public class IncomingDataTransfer extends IncomingTransferBase { return this.owner; } - public synchronized TransferStatus getStatus() { - return new TransferStatus(getChunks().getStatusArray(), getState()); - } - @Override public boolean isActive() { return getState() == TransferState.IDLE || getState() == TransferState.WORKING; diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/OutgoingDataTransfer.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/OutgoingDataTransfer.java index 581d7ba5..e2276908 100644 --- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/OutgoingDataTransfer.java +++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/OutgoingDataTransfer.java @@ -6,7 +6,6 @@ import java.security.KeyManagementException; import java.security.NoSuchAlgorithmException; import java.util.ArrayList; import java.util.List; -import java.util.UUID; import java.util.concurrent.ExecutorService; import org.apache.log4j.Logger; @@ -50,7 +49,7 @@ public class OutgoingDataTransfer extends AbstractTransfer { * @param absFile file to send to master server */ public OutgoingDataTransfer(TransferInformation transferInfo, File absFile) { - super(UUID.randomUUID().toString()); + super(transferInfo.token); this.masterTransferInfo = transferInfo; this.sourceFile = absFile; } |