You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by de...@apache.org on 2015/04/14 13:59:40 UTC
activemq git commit: https://issues.apache.org/jira/browse/AMQ-4929 -
remove BrokerService.supportFailoverSupport. This closes #60
Repository: activemq
Updated Branches:
refs/heads/master ec9a92f6f -> 2852a8bdb
https://issues.apache.org/jira/browse/AMQ-4929 - remove BrokerService.supportFailoverSupport. This closes #60
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/2852a8bd
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/2852a8bd
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/2852a8bd
Branch: refs/heads/master
Commit: 2852a8bdb1c6a09f6e59087630ea9d1ebbe02176
Parents: ec9a92f
Author: Dejan Bosanac <de...@nighttale.net>
Authored: Tue Apr 14 13:58:43 2015 +0200
Committer: Dejan Bosanac <de...@nighttale.net>
Committed: Tue Apr 14 13:59:01 2015 +0200
----------------------------------------------------------------------
.../org/apache/activemq/broker/BrokerService.java | 16 ----------------
.../apache/activemq/broker/TransactionBroker.java | 2 +-
2 files changed, 1 insertion(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/2852a8bd/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 f37381c..7b0f98e 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
@@ -208,7 +208,6 @@ public class BrokerService implements Service {
private boolean useLocalHostBrokerName;
private final CountDownLatch stoppedLatch = new CountDownLatch(1);
private final CountDownLatch startedLatch = new CountDownLatch(1);
- private boolean supportFailOver;
private Broker regionBroker;
private int producerSystemUsagePortion = 60;
private int consumerSystemUsagePortion = 40;
@@ -1765,21 +1764,6 @@ public class BrokerService implements Service {
}
/**
- * @return the supportFailOver
- */
- public boolean isSupportFailOver() {
- return this.supportFailOver;
- }
-
- /**
- * @param supportFailOver
- * the supportFailOver to set
- */
- public void setSupportFailOver(boolean supportFailOver) {
- this.supportFailOver = supportFailOver;
- }
-
- /**
* Looks up and lazily creates if necessary the destination for the given
* JMS name
*/
http://git-wip-us.apache.org/repos/asf/activemq/blob/2852a8bd/activemq-broker/src/main/java/org/apache/activemq/broker/TransactionBroker.java
----------------------------------------------------------------------
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/TransactionBroker.java b/activemq-broker/src/main/java/org/apache/activemq/broker/TransactionBroker.java
index 4b5ff8f..016baa4 100755
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/TransactionBroker.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/broker/TransactionBroker.java
@@ -380,7 +380,7 @@ public class TransactionBroker extends BrokerFilter {
public synchronized void brokerServiceStarted() {
super.brokerServiceStarted();
- if (getBrokerService().isSupportFailOver() && audit == null) {
+ if (audit == null) {
audit = new ActiveMQMessageAudit();
}
}