Author: ritchiem
Date: Sat Apr 11 00:39:15 2009
New Revision: 764123
URL: http://svn.apache.org/viewvc?rev=764123&view=rev
Log:
QPID-1633 : Ensured that FlowToDisk configuration defaults to 100Meg and is
picked up from the configuration files.
merged from trunk r764082
Modified:
qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java
qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
Modified:
qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java?rev=764123&r1=764122&r2=764123&view=diff
==============================================================================
---
qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java
(original)
+++
qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java
Sat Apr 11 00:39:15 2009
@@ -110,11 +110,11 @@
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());
}
}
Modified:
qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java?rev=764123&r1=764122&r2=764123&view=diff
==============================================================================
---
qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
(original)
+++
qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
Sat Apr 11 00:39:15 2009
@@ -156,7 +156,7 @@
public long getMemoryUsageMaximum()
{
- return _config.getLong("queues.maximumMemoryUsage", 0);
+ return _config.getLong("queues.maximumMemoryUsage", 100 * 1024 * 1024);
}
public long getMemoryUsageMinimum()
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
