svn commit: r796733 - /activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerTest.java

[gt...@apache.org]

Author: gtully
Date: Wed Jul 22 14:11:45 2009
New Revision: 796733

URL: http://svn.apache.org/viewvc?rev=796733&view=rev
Log:
add some detail to the assertion to help diagnost intermittent failure

Modified:
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerTest.java

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerTest.java?rev=796733&r1=796732&r2=796733&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerTest.java Wed Jul 22 14:11:45 2009
@@ -21,7 +21,6 @@
 import java.util.concurrent.TimeUnit;
 
 import javax.jms.DeliveryMode;
-import javax.jms.JMSException;
 
 import junit.framework.Test;
 
@@ -30,7 +29,6 @@
 import org.apache.activemq.command.ActiveMQTopic;
 import org.apache.activemq.command.ConnectionInfo;
 import org.apache.activemq.command.ConsumerInfo;
-import org.apache.activemq.command.DestinationInfo;
 import org.apache.activemq.command.LocalTransactionId;
 import org.apache.activemq.command.Message;
 import org.apache.activemq.command.MessageAck;
@@ -1236,7 +1234,8 @@
         }
 
         // give the async ack a chance to perculate and validate all are currently consumed
-        assertNull(connection1.getDispatchQueue().poll(MAX_NULL_WAIT, TimeUnit.MILLISECONDS));
+        Object result = connection1.getDispatchQueue().poll(MAX_NULL_WAIT, TimeUnit.MILLISECONDS);
+        assertNull("no more messages " + result, result);
  
         // Close the consumer.
         connection1.request(closeConsumerInfo(consumerInfo1));