Author: robbie
Date: Fri Jul 27 11:19:01 2012
New Revision: 1366339
URL: http://svn.apache.org/viewvc?rev=1366339&view=rev
Log:
QPID-4164: only keep a hard reference to the meta data if it has yet to be
persisted
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStore.java
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java?rev=1366339&r1=1366338&r2=1366339&view=diff
==============================================================================
---
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
(original)
+++
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
Fri Jul 27 11:19:01 2012
@@ -1594,7 +1594,10 @@ public abstract class AbstractBDBMessage
_messageId = messageId;
_isRecovered = isRecovered;
- _metaData = metaData;
+ if(!_isRecovered)
+ {
+ _metaData = metaData;
+ }
_metaDataRef = new
SoftReference<StorableMessageMetaData>(metaData);
}
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStore.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStore.java?rev=1366339&r1=1366338&r2=1366339&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStore.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStore.java
Fri Jul 27 11:19:01 2012
@@ -2057,8 +2057,11 @@ public class DerbyMessageStore implement
_messageId = messageId;
_isRecovered = isRecovered;
+ if(!_isRecovered)
+ {
+ _metaData = metaData;
+ }
_metaDataRef = new
SoftReference<StorableMessageMetaData>(metaData);
- _metaData = metaData;
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
