You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ri...@apache.org on 2009/04/11 00:16:18 UTC
svn commit: r764082 - in
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration:
QueueConfiguration.java VirtualHostConfiguration.java
Author: ritchiem
Date: Fri Apr 10 22:16:18 2009
New Revision: 764082
URL: http://svn.apache.org/viewvc?rev=764082&view=rev
Log:
QPID-1633 : Ensured that FlowToDisk configuration defaults to 100Meg and is picked up from the configuration files.
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java?rev=764082&r1=764081&r2=764082&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java Fri Apr 10 22:16:18 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/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java?rev=764082&r1=764081&r2=764082&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java Fri Apr 10 22:16:18 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:commits-subscribe@qpid.apache.org