Author: rajdavies
Date: Fri Sep 12 12:24:55 2008
New Revision: 694781
URL: http://svn.apache.org/viewvc?rev=694781&view=rev
Log:
Apply fix for https://issues.apache.org/activemq/browse/AMQ-1935
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/AbstractPendingMessageCursor.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/FilePendingMessageCursor.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/VMPendingMessageCursor.java
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/AbstractPendingMessageCursor.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/AbstractPendingMessageCursor.java?rev=694781&r1=694780&r2=694781&view=diff
==============================================================================
---
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/AbstractPendingMessageCursor.java
(original)
+++
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/AbstractPendingMessageCursor.java
Fri Sep 12 12:24:55 2008
@@ -41,7 +41,7 @@
protected int maxAuditDepth=1000;
protected boolean enableAudit=true;
protected ActiveMQMessageAudit audit;
- protected boolean useCache=false;
+ protected boolean useCache=true;
private boolean started=false;
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/FilePendingMessageCursor.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/FilePendingMessageCursor.java?rev=694781&r1=694780&r2=694781&view=diff
==============================================================================
---
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/FilePendingMessageCursor.java
(original)
+++
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/FilePendingMessageCursor.java
Fri Sep 12 12:24:55 2008
@@ -65,6 +65,7 @@
* @param store
*/
public FilePendingMessageCursor(Broker broker,String name) {
+ this.useCache=false;
this.broker = broker;
//the store can be null if the BrokerService has persistence
//turned off
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/VMPendingMessageCursor.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/VMPendingMessageCursor.java?rev=694781&r1=694780&r2=694781&view=diff
==============================================================================
---
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/VMPendingMessageCursor.java
(original)
+++
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/VMPendingMessageCursor.java
Fri Sep 12 12:24:55 2008
@@ -36,6 +36,10 @@
private LinkedList<MessageReference> list = new
LinkedList<MessageReference>();
private Iterator<MessageReference> iter;
private MessageReference last;
+
+ public VMPendingMessageCursor(){
+ this.useCache=false;
+ }
@Override