Author: rupertlssmith
Date: Mon Dec 17 09:00:10 2007
New Revision: 604928
URL: http://svn.apache.org/viewvc?rev=604928&view=rev
Log:
DUPS_OK mode set to be same as AUTO_ACK, fixed broken dups ok test.
Modified:
incubator/qpid/branches/M2.1.1/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
incubator/qpid/branches/M2.1.1/java/systests/src/main/java/org/apache/qpid/test/client/DupsOkTest.java
Modified:
incubator/qpid/branches/M2.1.1/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1.1/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java?rev=604928&r1=604927&r2=604928&view=diff
==============================================================================
---
incubator/qpid/branches/M2.1.1/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
(original)
+++
incubator/qpid/branches/M2.1.1/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
Mon Dec 17 09:00:10 2007
@@ -547,13 +547,6 @@
_logger.info("Closing consumer:" + debugIdentity());
}
- switch (_acknowledgeMode)
- {
- case Session.DUPS_OK_ACKNOWLEDGE:
- acknowledgeLastDelivered();
- break;
- }
-
synchronized (_connection.getFailoverMutex())
{
if (!_closed.getAndSet(true))
@@ -782,7 +775,7 @@
break;
case Session.DUPS_OK_ACKNOWLEDGE:
- if (++_outstanding >= _prefetchHigh)
+ /*( if (++_outstanding >= _prefetchHigh)
{
_dups_ok_acknowledge_send = true;
}
@@ -803,7 +796,7 @@
}
break;
-
+ */
case Session.AUTO_ACKNOWLEDGE:
// we do not auto ack a message if the application code called
recover()
if (!_session.isInRecovery())
Modified:
incubator/qpid/branches/M2.1.1/java/systests/src/main/java/org/apache/qpid/test/client/DupsOkTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1.1/java/systests/src/main/java/org/apache/qpid/test/client/DupsOkTest.java?rev=604928&r1=604927&r2=604928&view=diff
==============================================================================
---
incubator/qpid/branches/M2.1.1/java/systests/src/main/java/org/apache/qpid/test/client/DupsOkTest.java
(original)
+++
incubator/qpid/branches/M2.1.1/java/systests/src/main/java/org/apache/qpid/test/client/DupsOkTest.java
Mon Dec 17 09:00:10 2007
@@ -93,10 +93,10 @@
{
try
{
- if (message.getIntProperty("count") == 5000)
+ /*if (message.getIntProperty("count") == 5000)
{
assertEquals("The queue should have 4999 msgs
left", 4999, getMessageCount(_queue.getQueueName()));
- }
+ }*/
if (message.getIntProperty("count") == 9999)
{
