activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gtu...@apache.org
Subject svn commit: r1428397 - in /activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/broker: BrokerService.java LockableServiceSupport.java
Date Thu, 03 Jan 2013 15:17:35 GMT
Author: gtully
Date: Thu Jan  3 15:17:35 2013
New Revision: 1428397

URL: http://svn.apache.org/viewvc?rev=1428397&view=rev
Log:
fix up master advisory, advisories are only fired after broker is fully started so the nowMaster
advisory needs to ocurr after start rather than as part of persistence adapter start, resolves
org.apache.activemq.broker.ft.QueueMasterSlaveTestSupport#testAdvisory failures

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

Modified: activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java?rev=1428397&r1=1428396&r2=1428397&view=diff
==============================================================================
--- activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java
(original)
+++ activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java
Thu Jan  3 15:17:35 2013
@@ -662,6 +662,7 @@ public class BrokerService implements Se
         getBroker().brokerServiceStarted();
         checkSystemUsageLimits();
         startedLatch.countDown();
+        getBroker().nowMasterBroker();
     }
 
     /**

Modified: activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/broker/LockableServiceSupport.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/broker/LockableServiceSupport.java?rev=1428397&r1=1428396&r2=1428397&view=diff
==============================================================================
--- activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/broker/LockableServiceSupport.java
(original)
+++ activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/broker/LockableServiceSupport.java
Thu Jan  3 15:17:35 2013
@@ -89,9 +89,6 @@ public abstract class LockableServiceSup
                         }
                     }, lockKeepAlivePeriod, lockKeepAlivePeriod, TimeUnit.MILLISECONDS);
                 }
-                if (brokerService != null) {
-                    brokerService.getBroker().nowMasterBroker();
-                }
             }
         }
     }



Mime
View raw message