Author: chirino
Date: Thu Mar 20 10:49:45 2008
New Revision: 639388
URL: http://svn.apache.org/viewvc?rev=639388&view=rev
Log:
Better memory usage reference counting for the persistent message case.
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/AbstractStoreCursor.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/FilePendingMessageCursor.java
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/AbstractStoreCursor.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/AbstractStoreCursor.java?rev=639388&r1=639387&r2=639388&view=diff
==============================================================================
---
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/AbstractStoreCursor.java
(original)
+++
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/AbstractStoreCursor.java
Thu Mar 20 10:49:45 2008
@@ -114,6 +114,7 @@
if (!this.batchList.isEmpty()) {
Iterator<Entry<MessageId, Message>> i =
this.batchList.entrySet().iterator();
result = i.next().getValue();
+ result.decrementReferenceCount();
i.remove();
}
return result;
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=639388&r1=639387&r2=639388&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
Thu Mar 20 10:49:45 2008
@@ -189,7 +189,6 @@
}
}
systemUsage.getTempUsage().waitForSpace();
- node.decrementReferenceCount();
getDiskList().add(node);
} catch (Exception e) {
