summaryrefslogtreecommitdiff
path: root/java/client
diff options
context:
space:
mode:
authorAidan Skinner <aidan@apache.org>2008-02-20 17:12:32 +0000
committerAidan Skinner <aidan@apache.org>2008-02-20 17:12:32 +0000
commit3aed99f65d795c234faa9b584182cf3ea8c67b4a (patch)
tree8ef844f3a6ad1810a8e37a13c87ca23ddf51b603 /java/client
parentbc9cf0d495598b359fc1a67d03f4636ca610c6a9 (diff)
downloadqpid-python-3aed99f65d795c234faa9b584182cf3ea8c67b4a.tar.gz
QPID-786 Remove bogus Failover timeout, add test.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@629540 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/client')
-rw-r--r--java/client/src/main/java/org/apache/qpid/jms/FailoverPolicy.java12
1 files changed, 1 insertions, 11 deletions
diff --git a/java/client/src/main/java/org/apache/qpid/jms/FailoverPolicy.java b/java/client/src/main/java/org/apache/qpid/jms/FailoverPolicy.java
index 6ec883ff0b..8e3ccc3b02 100644
--- a/java/client/src/main/java/org/apache/qpid/jms/FailoverPolicy.java
+++ b/java/client/src/main/java/org/apache/qpid/jms/FailoverPolicy.java
@@ -34,7 +34,6 @@ public class FailoverPolicy
private static final long MINUTE = 60000L;
private static final long DEFAULT_METHOD_TIMEOUT = 1 * MINUTE;
- private static final long DEFAULT_FAILOVER_TIMEOUT = 4 * MINUTE;
private FailoverMethod[] _methods = new FailoverMethod[1];
@@ -161,16 +160,7 @@ public class FailoverPolicy
}
else
{
- if ((now - _lastFailTime) >= DEFAULT_FAILOVER_TIMEOUT)
- {
- _logger.info("Failover timeout");
-
- return false;
- }
- else
- {
- _lastMethodTime = now;
- }
+ _lastMethodTime = now;
}
}
else