You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ha...@apache.org on 2014/07/03 20:53:42 UTC
git commit: AMQ-5086. Fix the timeout arithmetic
Repository: activemq
Updated Branches:
refs/heads/trunk 5aef16ad0 -> 6521549ec
AMQ-5086. Fix the timeout arithmetic
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/6521549e
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/6521549e
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/6521549e
Branch: refs/heads/trunk
Commit: 6521549ec8858cfafe2f791023d1e7212b542ab7
Parents: 5aef16a
Author: Hadrian Zbarcea <ha...@apache.org>
Authored: Thu Jul 3 14:53:30 2014 -0400
Committer: Hadrian Zbarcea <ha...@apache.org>
Committed: Thu Jul 3 14:53:30 2014 -0400
----------------------------------------------------------------------
.../main/java/org/apache/activemq/broker/BrokerService.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/6521549e/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java
----------------------------------------------------------------------
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java b/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java
index 235ad5d..044af08 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java
@@ -138,6 +138,7 @@ public class BrokerService implements Service {
public static final String BROKER_VERSION;
public static final String DEFAULT_BROKER_NAME = "localhost";
public static final int DEFAULT_MAX_FILE_LENGTH = 1024 * 1024 * 32;
+ public static final long DEFAULT_START_TIMEOUT = 600000L;
private static final Logger LOG = LoggerFactory.getLogger(BrokerService.class);
@@ -157,7 +158,7 @@ public class BrokerService implements Service {
private boolean shutdownOnMasterFailure;
private boolean shutdownOnSlaveFailure;
private boolean waitForSlave;
- private long waitForSlaveTimeout = 600000L;
+ private long waitForSlaveTimeout = DEFAULT_START_TIMEOUT;
private boolean passiveSlave;
private String brokerName = DEFAULT_BROKER_NAME;
private File dataDirectoryFile;
@@ -249,7 +250,6 @@ public class BrokerService implements Service {
private boolean restartRequested = false;
private int storeOpenWireVersion = OpenWireFormat.DEFAULT_VERSION;
- private String configurationUrl;
static {
@@ -921,7 +921,7 @@ public class BrokerService implements Service {
* @return boolean true if wait succeeded false if broker was not started or was stopped
*/
public boolean waitUntilStarted() {
- return waitUntilStarted(Long.MAX_VALUE);
+ return waitUntilStarted(DEFAULT_START_TIMEOUT);
}
/**