You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2006/04/11 00:29:46 UTC
svn commit: r393106 - in /incubator/activemq/trunk/activemq-core/src:
main/java/org/apache/activemq/broker/region/DurableTopicSubscription.java
test/java/org/apache/activemq/JMSDurableTopicRedeliverTest.java
Author: chirino
Date: Mon Apr 10 15:29:40 2006
New Revision: 393106
URL: http://svn.apache.org/viewcvs?rev=393106&view=rev
Log:
The JMSDurableTopicRedeliverTest was failing intermitently.
Modified:
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/DurableTopicSubscription.java
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSDurableTopicRedeliverTest.java
Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/DurableTopicSubscription.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/DurableTopicSubscription.java?rev=393106&r1=393105&r2=393106&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/DurableTopicSubscription.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/DurableTopicSubscription.java Mon Apr 10 15:29:40 2006
@@ -107,8 +107,8 @@
pending.addFirst(node);
} else {
node.decrementReferenceCount();
- iter.remove();
}
+ iter.remove();
}
if( !keepDurableSubsActive ) {
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSDurableTopicRedeliverTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSDurableTopicRedeliverTest.java?rev=393106&r1=393105&r2=393106&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSDurableTopicRedeliverTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSDurableTopicRedeliverTest.java Mon Apr 10 15:29:40 2006
@@ -32,15 +32,14 @@
durable = true;
super.setUp();
}
-
-
+
/**
* Sends and consumes the messages.
*
* @throws Exception
*/
public void testRedeliverNewSession() throws Exception {
- String text = "TEST";
+ String text = "TEST: "+System.currentTimeMillis();
Message sendMessage = session.createTextMessage(text);
if (verbose) {
@@ -74,6 +73,6 @@
consumeSession = connection.createSession(false, Session.CLIENT_ACKNOWLEDGE);
consumer = createConsumer();
- assertNull(consumer.receiveNoWait());
+ assertNull(consumer.receive(1000));
}
}