summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
Diffstat (limited to 'java')
-rw-r--r--java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java5
-rw-r--r--java/broker/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStore.java5
2 files changed, 8 insertions, 2 deletions
diff --git a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java b/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
index 755cb9c89e..9323111fdd 100644
--- a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
+++ b/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
@@ -1594,7 +1594,10 @@ public abstract class AbstractBDBMessageStore implements MessageStore
_messageId = messageId;
_isRecovered = isRecovered;
- _metaData = metaData;
+ if(!_isRecovered)
+ {
+ _metaData = metaData;
+ }
_metaDataRef = new SoftReference<StorableMessageMetaData>(metaData);
}
diff --git a/java/broker/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStore.java b/java/broker/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStore.java
index bc9cda7f71..154d7e6535 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStore.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStore.java
@@ -2057,8 +2057,11 @@ public class DerbyMessageStore implements MessageStore
_messageId = messageId;
_isRecovered = isRecovered;
+ if(!_isRecovered)
+ {
+ _metaData = metaData;
+ }
_metaDataRef = new SoftReference<StorableMessageMetaData>(metaData);
- _metaData = metaData;
}
@Override