diff options
Diffstat (limited to 'java/broker/src')
5 files changed, 46 insertions, 9 deletions
diff --git a/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java b/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java index 043c048f51..25202460c0 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java +++ b/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()) diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java b/java/broker/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java index c1826218c8..79fdff2dc6 100644 --- a/java/broker/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java +++ b/java/broker/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java @@ -83,7 +83,7 @@ public class CurrentActorTest extends TestCase } - public void testFIFO() throws AMQException + public void testLIFO() throws AMQException { // Create a new actor using retrieving the rootMessageLogger from // the default ApplicationRegistry. diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/actors/TestLogActor.java b/java/broker/src/test/java/org/apache/qpid/server/logging/actors/TestLogActor.java index 86814517cb..acab5b28d2 100644 --- a/java/broker/src/test/java/org/apache/qpid/server/logging/actors/TestLogActor.java +++ b/java/broker/src/test/java/org/apache/qpid/server/logging/actors/TestLogActor.java @@ -27,7 +27,7 @@ public class TestLogActor extends AbstractActor public TestLogActor(RootMessageLogger rootLogger) { super(rootLogger); - _logString = "[Test Actor]"; + _logString = "[Test Actor] "; } }
\ No newline at end of file diff --git a/java/broker/src/test/java/org/apache/qpid/server/util/NullApplicationRegistry.java b/java/broker/src/test/java/org/apache/qpid/server/util/NullApplicationRegistry.java index ccfa84c5a6..8fef8baa02 100644 --- a/java/broker/src/test/java/org/apache/qpid/server/util/NullApplicationRegistry.java +++ b/java/broker/src/test/java/org/apache/qpid/server/util/NullApplicationRegistry.java @@ -26,7 +26,6 @@ import org.apache.qpid.server.configuration.ServerConfiguration; 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.BrokerActor; import org.apache.qpid.server.logging.actors.TestLogActor; import org.apache.qpid.server.logging.rawloggers.Log4jMessageLogger; import org.apache.qpid.server.management.NoopManagedObjectRegistry; @@ -42,6 +41,7 @@ import org.apache.qpid.server.virtualhost.VirtualHostRegistry; import java.util.Arrays; import java.util.Collection; import java.util.Properties; +import java.util.NoSuchElementException; public class NullApplicationRegistry extends ApplicationRegistry { @@ -79,9 +79,10 @@ public class NullApplicationRegistry extends ApplicationRegistry _virtualHostRegistry.registerVirtualHost(dummyHost); _virtualHostRegistry.setDefaultVirtualHostName("test"); _pluginManager = new PluginManager(""); + _startup = new Exception("NAR"); } - + private Exception _startup; public Collection<String> getVirtualHostNames() { String[] hosts = {"test"}; @@ -91,8 +92,23 @@ public class NullApplicationRegistry extends ApplicationRegistry @Override public void close() throws Exception { - super.close(); - CurrentActor.remove(); + try + { + super.close(); + } + finally + { + try + { + CurrentActor.remove(); + } + catch (NoSuchElementException npe) + { + _startup.printStackTrace(); + _startup.printStackTrace(System.err); + } + + } } } diff --git a/java/broker/src/test/java/org/apache/qpid/server/util/TestApplicationRegistry.java b/java/broker/src/test/java/org/apache/qpid/server/util/TestApplicationRegistry.java index 5089468633..43948c05c4 100644 --- a/java/broker/src/test/java/org/apache/qpid/server/util/TestApplicationRegistry.java +++ b/java/broker/src/test/java/org/apache/qpid/server/util/TestApplicationRegistry.java @@ -146,8 +146,14 @@ public class TestApplicationRegistry extends ApplicationRegistry @Override public void close() throws Exception { - super.close(); - CurrentActor.remove(); + try + { + super.close(); + } + finally + { + CurrentActor.remove(); + } } } |