You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2016/12/07 11:28:43 UTC
svn commit: r1773056 -
/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java
Author: orudyy
Date: Wed Dec 7 11:28:43 2016
New Revision: 1773056
URL: http://svn.apache.org/viewvc?rev=1773056&view=rev
Log:
QPID-7486: [Java Broker] Initialize and upgrade configuration store structure on activation of system config
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java?rev=1773056&r1=1773055&r2=1773056&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java Wed Dec 7 11:28:43 2016
@@ -255,9 +255,6 @@ public abstract class AbstractSystemConf
{
_configurationStore = new ManagementModeStoreHandler(_configurationStore, this);
}
-
- _configurationStore.init(this);
- _configurationStore.upgradeStoreStructure();
}
@@ -270,15 +267,6 @@ public abstract class AbstractSystemConf
public void run()
{
_configurationStore.closeConfigurationStore();
- _configurationStore = createStoreObject();
-
- if (isManagementMode())
- {
- _configurationStore = new ManagementModeStoreHandler(_configurationStore, AbstractSystemConfig.this);
- }
-
- _configurationStore.init(AbstractSystemConfig.this);
- _configurationStore.upgradeStoreStructure();
AbstractSystemConfig.super.setState(State.STOPPED);
}
});
@@ -354,6 +342,8 @@ public abstract class AbstractSystemConf
{
ConfiguredObjectRecord[] initialRecords = convertToConfigurationRecords(getInitialConfigurationLocation());
final DurableConfigurationStore store = getConfigurationStore();
+ store.init(AbstractSystemConfig.this);
+ store.upgradeStoreStructure();
final List<ConfiguredObjectRecord> records = new ArrayList<>();
boolean isNew = store.openConfigurationStore(new ConfiguredObjectRecordHandler()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org