You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by lq...@apache.org on 2016/12/13 16:50:09 UTC
svn commit: r1774053 - in
/qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/ack:
AcknowledgeOnMessageTest.java AcknowledgeTest.java
Author: lquack
Date: Tue Dec 13 16:50:08 2016
New Revision: 1774053
URL: http://svn.apache.org/viewvc?rev=1774053&view=rev
Log:
QPID-7546: AcknowledgeOnMessageTest: fix race condition for Qpid JMS AMQP 1.0 client
Also see this email thread about the client behaviour:
http://mail-archives.apache.org/mod_mbox/qpid-dev/201612.mbox/%3CCAP3WMuTWKa3bvuqDoJ-iWp1as0Ob4aKnojOVP06ZJTo%2B%3Dh647A%40mail.gmail.com%3E
Modified:
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/ack/AcknowledgeOnMessageTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/ack/AcknowledgeTest.java
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/ack/AcknowledgeOnMessageTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/ack/AcknowledgeOnMessageTest.java?rev=1774053&r1=1774052&r2=1774053&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/ack/AcknowledgeOnMessageTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/ack/AcknowledgeOnMessageTest.java Tue Dec 13 16:50:08 2016
@@ -93,6 +93,7 @@ public class AcknowledgeOnMessageTest ex
// Wait for messages to arrive
boolean complete = _receivedAll.await(10000L, TimeUnit.MILLISECONDS);
+ syncIfNotTransacted(transacted);
// If the messasges haven't arrived
while (!complete)
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/ack/AcknowledgeTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/ack/AcknowledgeTest.java?rev=1774053&r1=1774052&r2=1774053&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/ack/AcknowledgeTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/ack/AcknowledgeTest.java Tue Dec 13 16:50:08 2016
@@ -179,7 +179,7 @@ public class AcknowledgeTest extends Qpi
testAcking(false, AMQSession.PRE_ACKNOWLEDGE);
}
- private void syncIfNotTransacted(boolean transacted) throws Exception
+ protected void syncIfNotTransacted(boolean transacted) throws Exception
{
if(!transacted)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org