From 5790989fd05cc3694fab20804f719f38093dfd55 Mon Sep 17 00:00:00 2001 From: Martin Ritchie Date: Thu, 6 Aug 2009 09:40:25 +0000 Subject: QPID-2002 : Updates to Test ARs to correctly remove the CurrentActor on close. Update to CFAR to ensure that an Actor is set during shutdown. Update to TestLogActor's log Name and corrected CurrentActorTest's testname. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@801573 13f79535-47bb-0310-9956-ffa450edef68 --- .../registry/ConfigurationFileApplicationRegistry.java | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'qpid/java/broker/src/main') diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java index 043c048f51..25202460c0 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java @@ -71,10 +71,25 @@ public class ConfigurationFileApplicationRegistry extends ApplicationRegistry initialiseVirtualHosts(); - // Startup complete pop the current actor + // Startup complete pop the current actor CurrentActor.remove(); } + @Override + public void close() throws Exception + { + //Set the Actor for Broker Shutdown + CurrentActor.set(new BrokerActor(_rootMessageLogger)); + try + { + super.close(); + } + finally + { + CurrentActor.remove(); + } + } + private void initialiseVirtualHosts() throws Exception { for (String name : _configuration.getVirtualHosts()) -- cgit v1.2.1