diff options
Diffstat (limited to 'qpid/java/bdbstore/src')
2 files changed, 4 insertions, 43 deletions
diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAVirtualHostImpl.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAVirtualHostImpl.java index f66d157246..6ba0a4dd39 100644 --- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAVirtualHostImpl.java +++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAVirtualHostImpl.java @@ -23,13 +23,11 @@ package org.apache.qpid.server.virtualhost.berkeleydb; import java.util.Map; import java.util.Set; -import org.apache.qpid.server.logging.subjects.MessageStoreLogSubject; import org.apache.qpid.server.model.ConfiguredObject; import org.apache.qpid.server.model.ManagedAttributeField; import org.apache.qpid.server.model.ManagedObject; import org.apache.qpid.server.model.ManagedObjectFactoryConstructor; import org.apache.qpid.server.model.VirtualHostNode; -import org.apache.qpid.server.store.DurableConfigurationStore; import org.apache.qpid.server.store.MessageStore; import org.apache.qpid.server.store.berkeleydb.BDBConfigurationStore; import org.apache.qpid.server.store.berkeleydb.replication.ReplicatedEnvironmentFacade; @@ -43,7 +41,6 @@ public class BDBHAVirtualHostImpl extends AbstractVirtualHost<BDBHAVirtualHostIm public static final String TYPE = "BDB_HA"; private final BDBConfigurationStore _configurationStore; - private MessageStoreLogSubject _messageStoreLogSubject; @ManagedAttributeField(afterSet="setLocalTransactionSynchronizationPolicyOnEnvironment") private String _localTransactionSynchronizationPolicy; @@ -57,33 +54,15 @@ public class BDBHAVirtualHostImpl extends AbstractVirtualHost<BDBHAVirtualHostIm super(attributes, virtualHostNode); _configurationStore = (BDBConfigurationStore) virtualHostNode.getConfigurationStore(); - _messageStoreLogSubject = new MessageStoreLogSubject(getName(), _configurationStore.getMessageStore().getClass().getSimpleName()); } @Override - protected void initialiseStorage() - { - } - - @Override - public DurableConfigurationStore getDurableConfigurationStore() - { - return _configurationStore; - } - - @Override - public MessageStore getMessageStore() + protected MessageStore createMessageStore() { return _configurationStore.getMessageStore(); } @Override - protected MessageStoreLogSubject getMessageStoreLogSubject() - { - return _messageStoreLogSubject; - } - - @Override public String getLocalTransactionSynchronizationPolicy() { return _localTransactionSynchronizationPolicy; @@ -152,7 +131,7 @@ public class BDBHAVirtualHostImpl extends AbstractVirtualHost<BDBHAVirtualHostIm } catch(Exception e) { - throw new IllegalArgumentException("Invalid transaction syncronization policy '" + policy + "'. " + e.getMessage()); + throw new IllegalArgumentException("Invalid transaction synchronization policy '" + policy + "'. " + e.getMessage()); } } diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBVirtualHost.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBVirtualHost.java index 51fdcd1f2b..2f1c9f9387 100644 --- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBVirtualHost.java +++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBVirtualHost.java @@ -22,7 +22,6 @@ package org.apache.qpid.server.virtualhost.berkeleydb; 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 BDBVirtualHost extends AbstractVirtualHost<BDBVirtualHost> { public static final String VIRTUAL_HOST_TYPE = "BDB"; - private MessageStore _messageStore; - private MessageStoreLogSubject _messageStoreLogSubject; @ManagedObjectFactoryConstructor public BDBVirtualHost(final Map<String, Object> attributes, @@ -46,23 +43,8 @@ public class BDBVirtualHost extends AbstractVirtualHost<BDBVirtualHost> @Override - protected void initialiseStorage() + protected MessageStore createMessageStore() { - _messageStore = new BDBConfigurationStore().getMessageStore(); - - _messageStoreLogSubject = new MessageStoreLogSubject(getName(), _messageStore.getClass().getSimpleName()); - - } - - @Override - protected MessageStoreLogSubject getMessageStoreLogSubject() - { - return _messageStoreLogSubject; - } - - @Override - public MessageStore getMessageStore() - { - return _messageStore; + return new BDBConfigurationStore().getMessageStore(); } } |