diff options
| author | Robert Godfrey <rgodfrey@apache.org> | 2014-04-20 17:00:46 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org> | 2014-04-20 17:00:46 +0000 |
| commit | 130ff22d820d9c20a1bc7545031954ae59dad0ef (patch) | |
| tree | bfe88e4d58c61d9f5c0a4e56dc9c5a51f39579d6 /qpid/java/bdbstore/src/main | |
| parent | 3d34526bc2fe159b265d5a7c58ffd687ba00c499 (diff) | |
| download | qpid-python-130ff22d820d9c20a1bc7545031954ae59dad0ef.tar.gz | |
QPID-5713 : [Java Broker] Remove non-test references to model singleton, and instead treat as an instance variable
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1588794 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/bdbstore/src/main')
| -rw-r--r-- | qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom7To8.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom7To8.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom7To8.java index 8f3cf73275..0d4e40fdcb 100644 --- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom7To8.java +++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom7To8.java @@ -26,8 +26,8 @@ import java.util.HashMap; import java.util.Map; import java.util.UUID; +import org.apache.qpid.server.model.BrokerModel; import org.apache.qpid.server.model.ConfiguredObject; -import org.apache.qpid.server.model.Model; import org.apache.qpid.server.model.UUIDGenerator; import org.apache.qpid.server.store.ConfiguredObjectRecord; import org.apache.qpid.server.store.StoreException; @@ -68,7 +68,7 @@ public class UpgradeFrom7To8 extends AbstractStoreUpgrade Cursor objectsCursor = null; - String stringifiedConfigVersion = Model.MODEL_VERSION; + String stringifiedConfigVersion = BrokerModel.MODEL_VERSION; int configVersion = getConfigVersion(configVersionDb); if (configVersion > -1) { |