activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gtu...@apache.org
Subject svn commit: r1190265 - in /activemq/trunk/activemq-core/src: main/java/org/apache/activemq/ActiveMQMessageConsumer.java test/java/org/apache/activemq/broker/RedeliveryRestartTest.java
Date Fri, 28 Oct 2011 12:11:18 GMT
Author: gtully
Date: Fri Oct 28 12:11:18 2011
New Revision: 1190265

URL: http://svn.apache.org/viewvc?rev=1190265&view=rev
Log:
https://issues.apache.org/jira/browse/AMQ-3519 - fix intermittent failure of org.apache.activemq.broker.RedeliveryRestartTest.
inddividual ack marking delivery must be sent sync

Modified:
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/RedeliveryRestartTest.java

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java?rev=1190265&r1=1190264&r2=1190265&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java
(original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java
Fri Oct 28 12:11:18 2011
@@ -860,7 +860,7 @@ public class ActiveMQMessageConsumer imp
         registerSync();
         MessageAck ack = new MessageAck(md, MessageAck.INDIVIDUAL_ACK_TYPE, 1);
         ack.setTransactionId(session.getTransactionContext().getTransactionId());
-        session.sendAck(ack);
+        session.syncSendPacket(ack);
     }
 
     private void afterMessageIsConsumed(MessageDispatch md, boolean messageExpired) throws
JMSException {

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/RedeliveryRestartTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/RedeliveryRestartTest.java?rev=1190265&r1=1190264&r2=1190265&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/RedeliveryRestartTest.java
(original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/RedeliveryRestartTest.java
Fri Oct 28 12:11:18 2011
@@ -39,6 +39,7 @@ public class RedeliveryRestartTest exten
         super.configureBroker(broker);
         KahaDBPersistenceAdapter kahaDBPersistenceAdapter = (KahaDBPersistenceAdapter) broker.getPersistenceAdapter();
         kahaDBPersistenceAdapter.setRewriteOnRedelivery(true);
+        kahaDBPersistenceAdapter.setCleanupInterval(500);
         broker.addConnector("tcp://0.0.0.0:0");
     }
 



Mime
View raw message