diff options
| author | Aidan Skinner <aidan@apache.org> | 2009-03-03 09:48:47 +0000 |
|---|---|---|
| committer | Aidan Skinner <aidan@apache.org> | 2009-03-03 09:48:47 +0000 |
| commit | efac6d2dc3aba4ac590da1260ff843be7920e819 (patch) | |
| tree | bb971847d1665e199e62ef441be4d5d2ce8b6678 /java/broker/src/main | |
| parent | a179ded965c5cc70a0666d07737c38c67c1558c1 (diff) | |
| download | qpid-python-efac6d2dc3aba4ac590da1260ff843be7920e819.tar.gz | |
QPID-430: Change configuration variable name in line with review remarks.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@749572 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/broker/src/main')
2 files changed, 5 insertions, 3 deletions
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java b/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java index 3ff44da281..c0fe42c5c2 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java +++ b/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java @@ -505,8 +505,10 @@ public class ServerConfiguration implements SignalHandler _config.setProperty("housekeeping.expiredMessageCheckPeriod", value); } - public long getHousekeepingExpiredMessageCheckPeriod() + public long getHousekeepingCheckPeriod() { - return _config.getLong("housekeeping.expiredMessageCheckPeriod", DEFAULT_HOUSEKEEPING_PERIOD); + return _config.getLong("housekeeping.checkPeriod", + _config.getLong("housekeeping.expiredMessageCheckPeriod", + DEFAULT_HOUSEKEEPING_PERIOD)); } } 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 650f6722f2..343abe4b5a 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 @@ -92,7 +92,7 @@ public class VirtualHostConfiguration public long getHousekeepingExpiredMessageCheckPeriod() { - return _config.getLong("housekeeping.expiredMessageCheckPeriod", _serverConfiguration.getHousekeepingExpiredMessageCheckPeriod()); + return _config.getLong("housekeeping.expiredMessageCheckPeriod", _serverConfiguration.getHousekeepingCheckPeriod()); } public String getAuthenticationDatabase() |