svn commit: r1409871 - in /activemq/trunk: activemq-core/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveTest.java activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/KahaDBPersistenceAdapter.java

[gtully]

Author: gtully
Date: Thu Nov 15 16:34:02 2012
New Revision: 1409871

URL: http://svn.apache.org/viewvc?rev=1409871&view=rev
Log:
https://issues.apache.org/jira/browse/AMQ-4108 - fix unit test regression, 
QueueMasterSlaveTest,  related to 
https://issues.apache.org/jira/browse/AMQ-4005 and the dual impl of broker 
service aware. the auto created locker was not getting its broker service init. 
flakyness in test related to exponential backoff tool long for reconnect

Modified:
    
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveTest.java
    
activemq/trunk/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/KahaDBPersistenceAdapter.java

Modified: 
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveTest.java
URL: 
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveTest.java?rev=1409871&r1=1409870&r2=1409871&view=diff
==============================================================================
--- 
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveTest.java
 (original)
+++ 
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveTest.java
 Thu Nov 15 16:34:02 2012
@@ -47,7 +47,7 @@ public class QueueMasterSlaveTest extend
     protected CountDownLatch slaveStarted = new CountDownLatch(1);
     protected int inflightMessageCount;
     protected int failureCount = 50;
-    protected String uriString = 
"failover://(tcp://localhost:62001,tcp://localhost:62002)?randomize=false";
+    protected String uriString = 
"failover://(tcp://localhost:62001,tcp://localhost:62002)?randomize=false&useExponentialBackOff=false";
 
     protected void setUp() throws Exception {
         setMaxTestTime(TimeUnit.MINUTES.toMillis(10));
@@ -140,7 +140,9 @@ public class QueueMasterSlaveTest extend
 
         master.stop();
         assertTrue("slave started", slaveStarted.await(15, TimeUnit.SECONDS));
+        LOG.info("slave started");
         Message advisoryMessage = advConsumer.receive(5000);
+        LOG.info("received " + advisoryMessage);
         assertNotNull("Didn't received advisory", advisoryMessage);
 
     }

Modified: 
activemq/trunk/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/KahaDBPersistenceAdapter.java
URL: 
http://svn.apache.org/viewvc/activemq/trunk/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/KahaDBPersistenceAdapter.java?rev=1409871&r1=1409870&r2=1409871&view=diff
==============================================================================
--- 
activemq/trunk/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/KahaDBPersistenceAdapter.java
 (original)
+++ 
activemq/trunk/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/KahaDBPersistenceAdapter.java
 Thu Nov 15 16:34:02 2012
@@ -429,7 +429,9 @@ public class KahaDBPersistenceAdapter ex
         letter.setCheckForCorruptJournalFiles(checkForCorruptJournalFiles);
     }
 
+    @Override
     public void setBrokerService(BrokerService brokerService) {
+        super.setBrokerService(brokerService);
         letter.setBrokerService(brokerService);
     }