Author: rajdavies
Date: Tue Jul 8 23:35:00 2008
New Revision: 675104
URL: http://svn.apache.org/viewvc?rev=675104&view=rev
Log:
Fix for https://issues.apache.org/activemq/browse/AMQ-1796
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Queue.java
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Queue.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Queue.java?rev=675104&r1=675103&r2=675104&view=diff
==============================================================================
---
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Queue.java
(original)
+++
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Queue.java
Tue Jul 8 23:35:00 2008
@@ -1109,12 +1109,12 @@
MessageReference node = messages.next();
node.incrementReferenceCount();
messages.remove();
+ QueueMessageReference ref =
createMessageReference(node.getMessage());
if (!broker.isExpired(node)) {
- QueueMessageReference ref =
createMessageReference(node.getMessage());
result.add(ref);
count++;
} else {
- messageExpired(createConnectionContext(),
node);
+ messageExpired(createConnectionContext(), ref);
}
}
} finally {
