Author: orudyy
Date: Tue Nov 20 18:52:13 2012
New Revision: 1411794
URL: http://svn.apache.org/viewvc?rev=1411794&view=rev
Log:
QPID-4390: remove references to ApplicationRegistry.getInstance()
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0_SASL.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0_SASL.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0_SASL.java?rev=1411794&r1=1411793&r2=1411794&view=diff
==============================================================================
---
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0_SASL.java
(original)
+++
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0_SASL.java
Tue Nov 20 18:52:13 2012
@@ -160,8 +160,7 @@ public class ProtocolEngine_1_0_0_SASL i
Container container = new
Container(_appRegistry.getBrokerId().toString());
- _conn = new ConnectionEndpoint(container,
asSaslServerProvider(ApplicationRegistry.getInstance()
- .getSubjectCreator(getLocalAddress())));
+ _conn = new ConnectionEndpoint(container,
asSaslServerProvider(_appRegistry.getSubjectCreator(getLocalAddress())));
_conn.setConnectionEventListener(new Connection_1_0(_appRegistry,
_conn, _connectionId));
_conn.setRemoteAddress(getRemoteAddress());
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java?rev=1411794&r1=1411793&r2=1411794&view=diff
==============================================================================
---
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
(original)
+++
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
Tue Nov 20 18:52:13 2012
@@ -165,6 +165,7 @@ public class ApplicationRegistry impleme
public ApplicationRegistry(ConfigurationEntryStore store)
{
_store = store;
+ initialiseStatistics();
}
public void initialise() throws Exception
@@ -181,7 +182,6 @@ public class ApplicationRegistry impleme
try
{
- initialiseStatistics();
logStartupMessages(CurrentActor.get());
@@ -194,8 +194,6 @@ public class ApplicationRegistry impleme
_broker = (Broker) brokerRecoverer.create(provider,
_store.getRootEntry());
getVirtualHostRegistry().setDefaultVirtualHostName(configuration.getDefaultVirtualHost());
- initialiseStatisticsReporting();
-
// We have already loaded the BrokerMessages class by this point
so we
// need to refresh the locale setting in case we had a different
value in
@@ -234,12 +232,8 @@ public class ApplicationRegistry impleme
if (report > 0L && (broker || virtualhost))
{
_reportingTimer = new Timer("Statistics-Reporting", true);
-
-
-
- _reportingTimer.scheduleAtFixedRate(new
StatisticsReportingTask(broker, virtualhost, reset),
- report / 2,
- report);
+ StatisticsReportingTask task = new StatisticsReportingTask(broker,
virtualhost, reset, _rootMessageLogger);
+ _reportingTimer.scheduleAtFixedRate(task, report / 2, report);
}
}
@@ -248,21 +242,23 @@ public class ApplicationRegistry impleme
private final int DELIVERED = 0;
private final int RECEIVED = 1;
- private boolean _broker;
- private boolean _virtualhost;
- private boolean _reset;
-
+ private final boolean _broker;
+ private final boolean _virtualhost;
+ private final boolean _reset;
+ private final RootMessageLogger _logger;
- public StatisticsReportingTask(boolean broker, boolean virtualhost,
boolean reset)
+ public StatisticsReportingTask(boolean broker, boolean virtualhost,
boolean reset, RootMessageLogger logger)
{
_broker = broker;
_virtualhost = virtualhost;
_reset = reset;
+ _logger = logger;
}
public void run()
{
- CurrentActor.set(new
AbstractActor(ApplicationRegistry.getInstance().getRootMessageLogger()) {
+ CurrentActor.set(new AbstractActor(_logger)
+ {
public String getLogMessage()
{
return "[" + Thread.currentThread().getName() + "] ";
@@ -308,6 +304,7 @@ public class ApplicationRegistry impleme
* @return the IApplicationRegistry instance
* @throws IllegalStateException if no registry instance has been
initialised.
*/
+ @Deprecated
public static IApplicationRegistry getInstance() throws
IllegalStateException
{
IApplicationRegistry iApplicationRegistry = _instance.get();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
