summaryrefslogtreecommitdiffstats
path: root/src/main/java/org/openslx/filetransfer/util/AbstractTransfer.java
diff options
context:
space:
mode:
authorSimon Rettberg2019-04-09 15:10:51 +0200
committerSimon Rettberg2019-04-09 15:10:51 +0200
commit7273b4a9ee88ba51b21169fa28e83a1ca3bbb36e (patch)
tree9a725d61257d79b59012099d3f61ecf67de52df0 /src/main/java/org/openslx/filetransfer/util/AbstractTransfer.java
parent[vmware] Whitelist additional VMX options (diff)
downloadmaster-sync-shared-7273b4a9ee88ba51b21169fa28e83a1ca3bbb36e.tar.gz
master-sync-shared-7273b4a9ee88ba51b21169fa28e83a1ca3bbb36e.tar.xz
master-sync-shared-7273b4a9ee88ba51b21169fa28e83a1ca3bbb36e.zip
Refine active transfer detection and cancellation
Diffstat (limited to 'src/main/java/org/openslx/filetransfer/util/AbstractTransfer.java')
-rw-r--r--src/main/java/org/openslx/filetransfer/util/AbstractTransfer.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/org/openslx/filetransfer/util/AbstractTransfer.java b/src/main/java/org/openslx/filetransfer/util/AbstractTransfer.java
index 636f880..8171d93 100644
--- a/src/main/java/org/openslx/filetransfer/util/AbstractTransfer.java
+++ b/src/main/java/org/openslx/filetransfer/util/AbstractTransfer.java
@@ -78,7 +78,7 @@ public abstract class AbstractTransfer
public final boolean countsTowardsConnectionLimit( long now )
{
- return getActiveConnectionCount() > 0 || lastActivityTime.get() + HOT_IDLE_TIMEOUT > now;
+ return isActive() && ( getActiveConnectionCount() > 0 || lastActivityTime.get() + HOT_IDLE_TIMEOUT > now );
}
public final int connectFailCount()