From 2b6cb079a7793536db9945b59749a3a6c9d726a4 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 18 Apr 2016 18:01:03 +0200
Subject: Add queryUploadStatus to master server

---
 .../java/org/openslx/filetransfer/util/IncomingTransferBase.java   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/main/java/org/openslx/filetransfer/util/IncomingTransferBase.java')

diff --git a/src/main/java/org/openslx/filetransfer/util/IncomingTransferBase.java b/src/main/java/org/openslx/filetransfer/util/IncomingTransferBase.java
index 9406c27..04ddc17 100644
--- a/src/main/java/org/openslx/filetransfer/util/IncomingTransferBase.java
+++ b/src/main/java/org/openslx/filetransfer/util/IncomingTransferBase.java
@@ -15,6 +15,7 @@ import java.util.concurrent.ExecutorService;
 
 import org.apache.log4j.Logger;
 import org.openslx.bwlp.thrift.iface.TransferState;
+import org.openslx.bwlp.thrift.iface.TransferStatus;
 import org.openslx.filetransfer.DataReceivedCallback;
 import org.openslx.filetransfer.Downloader;
 import org.openslx.filetransfer.FileRange;
@@ -107,7 +108,7 @@ public abstract class IncomingTransferBase extends AbstractTransfer implements H
 				download.cancel();
 			}
 		}
-		lastActivityTime.set( 0 );
+		potentialFinishTime.set( 0 );
 		safeClose( tmpFileHandle );
 	}
 
@@ -154,6 +155,10 @@ public abstract class IncomingTransferBase extends AbstractTransfer implements H
 		return state;
 	}
 
+	public synchronized TransferStatus getStatus() {
+		return new TransferStatus(chunks.getStatusArray(), getState());
+	}
+
 	public final ChunkList getChunks()
 	{
 		return chunks;
-- 
cgit v1.2.3-55-g7522