QPID-5965 : [Java Broker] flow transient messages to disk in low memory situations

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1616155 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 25 insertions, 0 deletions

diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
index 7e5f5bbb3f..338882e6df 100644
--- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
@@ -1424,12 +1424,25 @@ public abstract class AbstractBDBMessageStore implements MessageStore
             storedSizeChangeOccurred(-delta);
         }
 
+        @Override
+        public boolean isInMemory()
+        {
+            return _messageDataRef.isHardRef();
+        }
+
         private boolean stored()
         {
             return !_messageDataRef.isHardRef();
         }
 
         @Override
+        public boolean flowToDisk()
+        {
+            flushToStore();
+            return true;
+        }
+
+        @Override
         public String toString()
         {
             return this.getClass() + "[messageId=" + _messageId + "]";
diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAReplicaVirtualHost.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAReplicaVirtualHost.java
index 74242df7c6..55805b5626 100644
--- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAReplicaVirtualHost.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAReplicaVirtualHost.java
@@ -338,6 +338,18 @@ public class BDBHAReplicaVirtualHost extends AbstractConfiguredObject<BDBHARepli
     }
 
     @Override
+    public void setTargetSize(final long targetSize)
+    {
+
+    }
+
+    @Override
+    public long getTotalQueueDepthBytes()
+    {
+        return 0l;
+    }
+
+    @Override
     public org.apache.qpid.server.security.SecurityManager getSecurityManager()
     {
         return null;