summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAidan Skinner <aidan@apache.org>2009-04-13 14:10:25 +0000
committerAidan Skinner <aidan@apache.org>2009-04-13 14:10:25 +0000
commit10d570dcb7b5cdccc6273bd907a2339aa2fc9956 (patch)
treeb061e5fdbccfbcab1637273bf7bb913facedfc26
parent4e26b3c3e1eab49d04b763beb57a3174afb6396b (diff)
downloadqpid-python-10d570dcb7b5cdccc6273bd907a2339aa2fc9956.tar.gz
Fix method call from merge gubbins
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-fix@764477 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java2
1 files changed, 1 insertions, 1 deletions
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 21041d55cd..f51e515db1 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
@@ -73,7 +73,7 @@ public class VirtualHostConfiguration
public long getHousekeepingExpiredMessageCheckPeriod()
{
- return _config.getLong("housekeeping.expiredMessageCheckPeriod", ApplicationRegistry.getInstance().getConfiguration().getHousekeepingExpiredMessageCheckPeriod());
+ return _config.getLong("housekeeping.expiredMessageCheckPeriod", ApplicationRegistry.getInstance().getConfiguration().getHousekeepingCheckPeriod());
}
public String getAuthenticationDatabase()