Author: rgodfrey
Date: Thu Nov 12 10:33:44 2015
New Revision: 1714008
URL: http://svn.apache.org/viewvc?rev=1714008&view=rev
Log:
QPID-6841 : Calling recover should not modify the lastSeenEntry of the consumer
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java?rev=1714008&r1=1714007&r2=1714008&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
Thu Nov 12 10:33:44 2015
@@ -1320,7 +1320,7 @@ public abstract class AbstractQueue<X ex
}
else
{
- deliverMessage(sub, entry, false);
+ deliverMessage(sub, entry, false, true);
}
}
finally
@@ -1401,9 +1401,15 @@ public abstract class AbstractQueue<X ex
getAtomicQueueCount().incrementAndGet();
}
- private void deliverMessage(final QueueConsumer<?> sub, final QueueEntry
entry, boolean batch)
+ private void deliverMessage(final QueueConsumer<?> sub,
+ final QueueEntry entry,
+ boolean batch,
+ final boolean updateLastSeen)
{
- setLastSeenEntry(sub, entry);
+ if(updateLastSeen)
+ {
+ setLastSeenEntry(sub, entry);
+ }
_deliveredMessages.incrementAndGet();
@@ -1506,7 +1512,7 @@ public abstract class AbstractQueue<X ex
{
if (!consumer.isClosed())
{
- deliverMessage(consumer, entry, false);
+ deliverMessage(consumer, entry, false, false);
return true;
}
else
@@ -2199,7 +2205,7 @@ public abstract class AbstractQueue<X ex
}
else
{
- deliverMessage(sub, node, batch);
+ deliverMessage(sub, node, batch, true);
}
}
finally
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
