diff options
Diffstat (limited to 'java')
2 files changed, 3 insertions, 3 deletions
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java b/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java index 256d15e7db..0b702b8505 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java +++ b/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java @@ -110,11 +110,11 @@ public class QueueConfiguration public long getMemoryUsageMaximum() { - return _config.getLong("maximumMemoryUsage", 100 * 1024 * 1024); //100Meg + return _config.getLong("maximumMemoryUsage", _vHostConfig.getMemoryUsageMaximum()); } public long getMemoryUsageMinimum() { - return _config.getLong("minimumMemoryUsage", 0); + return _config.getLong("minimumMemoryUsage", _vHostConfig.getMemoryUsageMinimum()); } } diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java b/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java index 8d9f848b49..edcb32fc43 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java +++ b/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java @@ -156,7 +156,7 @@ public class VirtualHostConfiguration public long getMemoryUsageMaximum() { - return _config.getLong("queues.maximumMemoryUsage", 0); + return _config.getLong("queues.maximumMemoryUsage", 100 * 1024 * 1024); } public long getMemoryUsageMinimum() |