Author: ritchiem
Date: Wed Feb 25 11:32:56 2009
New Revision: 747755
URL: http://svn.apache.org/viewvc?rev=747755&view=rev
Log:
QPID-1686 - Had to had another AR.getInstance() call as alternative is to
complete this JIRA.
Modified:
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/VirtualHostConfiguration.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java?rev=747755&r1=747754&r2=747755&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
Wed Feb 25 11:32:56 2009
@@ -70,9 +70,19 @@
}
}
+ /**
+ * All future usages should use the constructor that takes the
ServerConfiguration.
+ *
+ * This can be removed after QPID-1696 has been resolved.
+ *
+ * @param name
+ * @param mungedConf
+ * @throws ConfigurationException
+ */
+ @Deprecated
public VirtualHostConfiguration(String name, Configuration mungedConf)
throws ConfigurationException
{
- this(name,mungedConf, new ServerConfiguration(new
PropertiesConfiguration()));
+ this(name,mungedConf,
ApplicationRegistry.getInstance().getConfiguration());
}
public String getName()
@@ -82,7 +92,7 @@
public long getHousekeepingExpiredMessageCheckPeriod()
{
- return _config.getLong("housekeeping.expiredMessageCheckPeriod",
ApplicationRegistry.getInstance().getConfiguration().getHousekeepingExpiredMessageCheckPeriod());
+ return _config.getLong("housekeeping.expiredMessageCheckPeriod",
_serverConfiguration.getHousekeepingExpiredMessageCheckPeriod());
}
public String getAuthenticationDatabase()
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
