From 79297e1b525cca2e059c5d3d64c7f050bc7e0935 Mon Sep 17 00:00:00 2001 From: David McKnight Date: Fri, 9 May 2008 14:28:28 +0000 Subject: [PATCH] [231126] [dstore] status monitor needs to reset WaitThreshold on nudge --- .../rse/connectorservice/dstore/util/StatusMonitor.java | 5 +++-- .../rse/services/dstore/util/DStoreStatusMonitor.java | 4 ++-- .../eclipse/rse/services/dstore/util/DownloadListener.java | 7 ++++--- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/util/StatusMonitor.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/util/StatusMonitor.java index 10d6c013e4e..101a1bc24b9 100644 --- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/util/StatusMonitor.java +++ b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/util/StatusMonitor.java @@ -287,13 +287,14 @@ public class StatusMonitor implements IDomainListener, ICommunicationsListener Display display = Display.getCurrent(); // Prevent infinite looping by introducing a threshold for wait - final int initialWaitThreshold = 50; - int WaitThreshold = initialWaitThreshold; + + int WaitThreshold = 50; if ( wait > 0 ) WaitThreshold = wait*10; // 1 second means 10 sleep(100ms) else if ( wait == -1 ) // force a diagnostic WaitThreshold = -1; + int initialWaitThreshold = WaitThreshold; int nudges = 0; // nudges used for waking up server with slow connections // nudge up to 12 times before giving up diff --git a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/util/DStoreStatusMonitor.java b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/util/DStoreStatusMonitor.java index 24f135ad42a..15e3b2aa03f 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/util/DStoreStatusMonitor.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/util/DStoreStatusMonitor.java @@ -255,13 +255,13 @@ public class DStoreStatusMonitor implements IDomainListener // Prevent infinite looping by introducing a threshold for wait - final int initialWaitThreshold = 50; - int WaitThreshold = initialWaitThreshold; + int WaitThreshold = 50; if ( wait > 0 ) WaitThreshold = wait*10; // 1 second means 10 sleep(100ms) else if ( wait == -1 ) // force a diagnostic WaitThreshold = -1; + int initialWaitThreshold = WaitThreshold; int nudges = 0; // nudges used for waking up server with slow connections // nudge up to 12 times before giving up diff --git a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/util/DownloadListener.java b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/util/DownloadListener.java index ca42c0a566c..460ae57a256 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/util/DownloadListener.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/util/DownloadListener.java @@ -235,14 +235,15 @@ public class DownloadListener implements IDomainListener public DataElement waitForUpdate(int wait) throws InterruptedException { // Prevent infinite looping by introducing a threshold for wait - final int initialWaitTheshold = 50; - int WaitThreshold = initialWaitTheshold; + + int WaitThreshold = 50; if (wait > 0) WaitThreshold = wait * 10; // 1 second means 10 sleep(100ms) else if (wait == -1) // force a diagnostic WaitThreshold = -1; - + + int initialWaitTheshold = WaitThreshold; { // Current thread is not UI thread while (!_isDone && !_isCancelled && !_networkDown)