summaryrefslogtreecommitdiff
path: root/qpid/java/broker/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'qpid/java/broker/src/main')
-rw-r--r--qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java17
1 files changed, 16 insertions, 1 deletions
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())