From 5015aea005287d8f6fc17cdd5147e03394a58f5b Mon Sep 17 00:00:00 2001 From: Keith Wall Date: Fri, 13 Jun 2014 16:52:33 +0000 Subject: QPID-5802: [Java Broker] Refactor VH implementations to avoid duplicated message store/message store subject code. This addresses review comments from Alex Rudyy. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1602475 13f79535-47bb-0310-9956-ffa450edef68 --- .../server/virtualhost/jdbc/JDBCVirtualHost.java | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) (limited to 'qpid/java/broker-plugins/jdbc-store/src') diff --git a/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhost/jdbc/JDBCVirtualHost.java b/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhost/jdbc/JDBCVirtualHost.java index 8acf474321..1dd39a8696 100644 --- a/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhost/jdbc/JDBCVirtualHost.java +++ b/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhost/jdbc/JDBCVirtualHost.java @@ -22,7 +22,6 @@ package org.apache.qpid.server.virtualhost.jdbc; import java.util.Map; -import org.apache.qpid.server.logging.subjects.MessageStoreLogSubject; import org.apache.qpid.server.model.ManagedObject; import org.apache.qpid.server.model.ManagedObjectFactoryConstructor; import org.apache.qpid.server.model.VirtualHostNode; @@ -34,8 +33,6 @@ import org.apache.qpid.server.virtualhost.AbstractVirtualHost; public class JDBCVirtualHost extends AbstractVirtualHost { public static final String VIRTUAL_HOST_TYPE = "JDBC"; - private MessageStore _messageStore; - private MessageStoreLogSubject _messageStoreLogSubject; @ManagedObjectFactoryConstructor public JDBCVirtualHost(final Map attributes, @@ -46,23 +43,8 @@ public class JDBCVirtualHost extends AbstractVirtualHost @Override - protected void initialiseStorage() + protected MessageStore createMessageStore() { - _messageStore = new JDBCMessageStore().getMessageStore(); - - _messageStoreLogSubject = new MessageStoreLogSubject(getName(), _messageStore.getClass().getSimpleName()); - - } - - @Override - protected MessageStoreLogSubject getMessageStoreLogSubject() - { - return _messageStoreLogSubject; - } - - @Override - public MessageStore getMessageStore() - { - return _messageStore; + return new JDBCMessageStore().getMessageStore(); } } -- cgit v1.2.1