From 52da9438797254898d8bec4e8d26f77158c6bd23 Mon Sep 17 00:00:00 2001
From: Aidan Skinner <aidan@apache.org>
Date: Tue, 3 Mar 2009 09:48:47 +0000
Subject: QPID-430: Change configuration variable name in line with review
 remarks.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@749572 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/qpid/server/configuration/ServerConfiguration.java   | 6 ++++--
 .../apache/qpid/server/configuration/VirtualHostConfiguration.java  | 2 +-
 .../apache/qpid/server/configuration/ServerConfigurationTest.java   | 6 +++---
 3 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'qpid/java')

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
index 3ff44da281..c0fe42c5c2 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
+++ b/qpid/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/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
index 650f6722f2..343abe4b5a 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
+++ b/qpid/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()
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
index fb231be7fd..ad1df1c777 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
@@ -623,14 +623,14 @@ public class ServerConfigurationTest extends TestCase
     {
         // Check default
         ServerConfiguration serverConfig = new ServerConfiguration(_config);
-        assertEquals(30000, serverConfig.getHousekeepingExpiredMessageCheckPeriod());
+        assertEquals(30000, serverConfig.getHousekeepingCheckPeriod());
 
         // Check value we set
         _config.setProperty("housekeeping.expiredMessageCheckPeriod", 23L);
         serverConfig = new ServerConfiguration(_config);
-        assertEquals(23, serverConfig.getHousekeepingExpiredMessageCheckPeriod());
+        assertEquals(23, serverConfig.getHousekeepingCheckPeriod());
         serverConfig.setHousekeepingExpiredMessageCheckPeriod(42L);
-        assertEquals(42, serverConfig.getHousekeepingExpiredMessageCheckPeriod());
+        assertEquals(42, serverConfig.getHousekeepingCheckPeriod());
     }
 
     public void testSingleConfiguration() throws IOException, ConfigurationException
-- 
cgit v1.2.1