Author: ritchiem
Date: Fri Mar 20 15:16:13 2009
New Revision: 756518
URL: http://svn.apache.org/viewvc?rev=756518&view=rev
Log:
QPID-1763 : Fixed slow down due to fs lookup for unloaded message introduced in
r748516
Merged from branches/0.5-release : r756506
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java?rev=756518&r1=756517&r2=756518&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java
Fri Mar 20 15:16:13 2009
@@ -84,6 +84,7 @@
private static final byte IMMEDIATE_AND_DELIVERED = (byte) (IMMEDIATE |
DELIVERED_TO_CONSUMER);
private boolean _persistent;
+ private boolean _hasBeenUnloaded = false;
QueueEntryImpl(SimpleQueueEntryList queueEntryList)
{
@@ -407,11 +408,16 @@
try
{
- _backingStore.unload(_message);
-
- if (_log.isDebugEnabled())
+ if (!_hasBeenUnloaded)
{
- _log.debug("Unloaded:" + debugIdentity());
+ _hasBeenUnloaded = true;
+
+ _backingStore.unload(_message);
+
+ if (_log.isDebugEnabled())
+ {
+ _log.debug("Unloaded:" + debugIdentity());
+ }
}
_message = null;
@@ -502,7 +508,7 @@
if (state != DELETED_STATE && _stateUpdater.compareAndSet(this, state,
DELETED_STATE))
{
_queueEntryList.advanceHead();
- if (_backingStore != null)
+ if (_backingStore != null && _hasBeenUnloaded)
{
_backingStore.delete(_messageId);
}
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
