diff options
| author | Martin Ritchie <ritchiem@apache.org> | 2009-08-03 13:21:43 +0000 |
|---|---|---|
| committer | Martin Ritchie <ritchiem@apache.org> | 2009-08-03 13:21:43 +0000 |
| commit | 6257410df5bf96a29deb79ae6d97605058969fab (patch) | |
| tree | 751f487df6f2b8c7ef69910721e9c6febf24d129 /java | |
| parent | 8544a92ae006a7eac0e8f08a6a358f94bdab0c26 (diff) | |
| download | qpid-python-6257410df5bf96a29deb79ae6d97605058969fab.tar.gz | |
QPID-2001 : Corrected MSLSubject, extracting the Store from the vhost fails to retrieve the right value during startup. So better to explicitly specify the vhost and message store.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@800360 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java')
2 files changed, 4 insertions, 3 deletions
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/MessagesStoreLogSubject.java b/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/MessagesStoreLogSubject.java index 8a8708eb25..28d64de74e 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/MessagesStoreLogSubject.java +++ b/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/MessagesStoreLogSubject.java @@ -21,6 +21,7 @@ package org.apache.qpid.server.logging.subjects; import org.apache.qpid.server.virtualhost.VirtualHost; +import org.apache.qpid.server.store.MessageStore; public class MessagesStoreLogSubject extends AbstractLogSubject { @@ -36,9 +37,9 @@ public class MessagesStoreLogSubject extends AbstractLogSubject protected static String BINDING_FORMAT = "vh(/{0})/ms({1})"; /** Create an ExchangeLogSubject that Logs in the following format. */ - public MessagesStoreLogSubject(VirtualHost vhost) + public MessagesStoreLogSubject(VirtualHost vhost, MessageStore store) { setLogStringWithFormat(BINDING_FORMAT, vhost.getName(), - vhost.getMessageStore().getClass().getSimpleName()); + store.getClass().getSimpleName()); } } diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubjectTest.java b/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubjectTest.java index 05e86b9554..624421f447 100644 --- a/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubjectTest.java +++ b/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubjectTest.java @@ -34,7 +34,7 @@ public class MessageStoreLogSubjectTest extends AbstractTestLogSubject _testVhost = ApplicationRegistry.getInstance().getVirtualHostRegistry(). getVirtualHost("test"); - _subject = new MessagesStoreLogSubject(_testVhost); + _subject = new MessagesStoreLogSubject(_testVhost, _testVhost.getMessageStore()); } /** |