activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rajdav...@apache.org
Subject svn commit: r925351 - in /activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker: BrokerService.java TransportConnector.java
Date Fri, 19 Mar 2010 17:41:13 GMT
Author: rajdavies
Date: Fri Mar 19 17:41:13 2010
New Revision: 925351

URL: http://svn.apache.org/viewvc?rev=925351&view=rev
Log:
Fix order in which scheduler is used in the broker

Modified:
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnector.java

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java?rev=925351&r1=925350&r2=925351&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
(original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
Fri Mar 19 17:41:13 2010
@@ -1803,7 +1803,6 @@ public class BrokerService implements Se
      * @throws IOException
      */
     protected Broker addInterceptors(Broker broker) throws Exception {
-        broker = new TransactionBroker(broker, getPersistenceAdapter().createTransactionStore());
         if (isSchedulerSupport()) {
             SchedulerBroker sb = new SchedulerBroker(broker, getSchedulerDirectoryFile());
             if (isUseJmx()) {
@@ -1823,6 +1822,7 @@ public class BrokerService implements Se
             }
             broker = sb;
         }
+        broker = new TransactionBroker(broker, getPersistenceAdapter().createTransactionStore());
         if (isAdvisorySupport()) {
             broker = new AdvisoryBroker(broker);
         }

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnector.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnector.java?rev=925351&r1=925350&r2=925351&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnector.java
(original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnector.java
Fri Mar 19 17:41:13 2010
@@ -204,8 +204,8 @@ public class TransportConnector implemen
         brokerInfo.setBrokerId(broker.getBrokerId());
         brokerInfo.setPeerBrokerInfos(broker.getPeerBrokerInfos());
         brokerInfo.setFaultTolerantConfiguration(broker.isFaultTolerantConfiguration());
-        brokerInfo.setBrokerURL(server.getConnectURI().toString());
-        server.setAcceptListener(new TransportAcceptListener() {
+        brokerInfo.setBrokerURL(getServer().getConnectURI().toString());
+        getServer().setAcceptListener(new TransportAcceptListener() {
             public void onAccept(final Transport transport) {
                 try {
                     getDefaultTaskRunnerFactory().execute(new Runnable() {
@@ -236,8 +236,8 @@ public class TransportConnector implemen
                 LOG.debug("Reason: " + error, error);
             }
         });
-        server.setBrokerInfo(brokerInfo);
-        server.start();
+        getServer().setBrokerInfo(brokerInfo);
+        getServer().start();
 
         DiscoveryAgent da = getDiscoveryAgent();
         if (da != null) {



Mime
View raw message