summaryrefslogtreecommitdiff
path: root/qpid/java/broker/src
diff options
context:
space:
mode:
authorMartin Ritchie <ritchiem@apache.org>2009-10-05 14:57:55 +0000
committerMartin Ritchie <ritchiem@apache.org>2009-10-05 14:57:55 +0000
commit83b83edf1257357fc34168211b3a0c0ec86b5bbc (patch)
treefd5f01636d2b5d406fdfc395d0698f7bdb4a43c7 /qpid/java/broker/src
parent9a66cabbcc5bcd53d8ea682a90bf2e5b51500f9c (diff)
downloadqpid-python-83b83edf1257357fc34168211b3a0c0ec86b5bbc.tar.gz
Added close actor to NAR to prevent exception during InVM broker shutdown.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@821816 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker/src')
-rw-r--r--qpid/java/broker/src/test/java/org/apache/qpid/server/util/NullApplicationRegistry.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/util/NullApplicationRegistry.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/util/NullApplicationRegistry.java
index 705e7d2ad7..6b8201eefb 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/util/NullApplicationRegistry.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/util/NullApplicationRegistry.java
@@ -27,6 +27,7 @@ import org.apache.qpid.server.configuration.VirtualHostConfiguration;
import org.apache.qpid.server.logging.RootMessageLoggerImpl;
import org.apache.qpid.server.logging.actors.CurrentActor;
import org.apache.qpid.server.logging.actors.TestLogActor;
+import org.apache.qpid.server.logging.actors.BrokerActor;
import org.apache.qpid.server.logging.rawloggers.Log4jMessageLogger;
import org.apache.qpid.server.management.NoopManagedObjectRegistry;
import org.apache.qpid.server.plugins.PluginManager;
@@ -92,6 +93,8 @@ public class NullApplicationRegistry extends ApplicationRegistry
@Override
public void close() throws Exception
{
+ CurrentActor.set(new BrokerActor(_rootMessageLogger));
+
try
{
super.close();