Author: ritchiem
Date: Mon Aug 3 13:21:43 2009
New Revision: 800360
URL: http://svn.apache.org/viewvc?rev=800360&view=rev
Log:
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.
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/MessagesStoreLogSubject.java
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubjectTest.java
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/MessagesStoreLogSubject.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/MessagesStoreLogSubject.java?rev=800360&r1=800359&r2=800360&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/MessagesStoreLogSubject.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/MessagesStoreLogSubject.java
Mon Aug 3 13:21:43 2009
@@ -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 @@
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());
}
}
Modified:
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubjectTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubjectTest.java?rev=800360&r1=800359&r2=800360&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubjectTest.java
(original)
+++
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubjectTest.java
Mon Aug 3 13:21:43 2009
@@ -34,7 +34,7 @@
_testVhost =
ApplicationRegistry.getInstance().getVirtualHostRegistry().
getVirtualHost("test");
- _subject = new MessagesStoreLogSubject(_testVhost);
+ _subject = new MessagesStoreLogSubject(_testVhost,
_testVhost.getMessageStore());
}
/**
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
