diff options
| author | Martin Ritchie <ritchiem@apache.org> | 2009-04-10 22:16:18 +0000 |
|---|---|---|
| committer | Martin Ritchie <ritchiem@apache.org> | 2009-04-10 22:16:18 +0000 |
| commit | b23244b7935afa725afd6023fde3e7ef3c1d2d13 (patch) | |
| tree | a4f6324bedc57b79f11f3ce88355d4912b2607e7 /java | |
| parent | 37a8f302db800ebb5328b955ec1c29fb3342d499 (diff) | |
| download | qpid-python-b23244b7935afa725afd6023fde3e7ef3c1d2d13.tar.gz | |
QPID-1633 : Ensured that FlowToDisk configuration defaults to 100Meg and is picked up from the configuration files.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@764082 13f79535-47bb-0310-9956-ffa450edef68
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() |