diff options
| author | Keith Wall <kwall@apache.org> | 2014-04-04 10:21:37 +0000 |
|---|---|---|
| committer | Keith Wall <kwall@apache.org> | 2014-04-04 10:21:37 +0000 |
| commit | db86d03af2ce0f704398c2a9392e91e9637154ec (patch) | |
| tree | 9b2cad7913dd50a2ea765cebbe668c4eece0c50c /qpid/java/broker-plugins/derby-store/src | |
| parent | 2ca0740a9f1cc975b4e0225d8253be7f16476035 (diff) | |
| download | qpid-python-db86d03af2ce0f704398c2a9392e91e9637154ec.tar.gz | |
QPID-5653: Replace DurableConfigurationStore/MessageStore recoverers with visitors.
* MS/DCS impls now have stateless visitXXX methods to retrieve message/configuration data (replaces the recoverXXXX methods)
* VH implementations now uses Handlers to perform the recovery operation.
* DCS's handler (ConfiguredObjectRecordRecoveverAndUpgrader) currently implemented in terms of the old DefaultUpgradeProvider/DurableConfigurationRecoverer.
This will be refactored by a future commit.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1584600 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker-plugins/derby-store/src')
2 files changed, 6 insertions, 9 deletions
diff --git a/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStore.java b/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStore.java index 9202672ea6..d682076350 100644 --- a/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStore.java +++ b/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStore.java @@ -417,12 +417,6 @@ public class DerbyMessageStore extends AbstractJDBCMessageStore implements Messa } @Override - public String getStoreType() - { - return TYPE; - } - - @Override public void onDelete() { if (_logger.isDebugEnabled()) diff --git a/qpid/java/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/DerbyMessageStoreTest.java b/qpid/java/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/DerbyMessageStoreTest.java index 20de4ea339..9a2d945494 100644 --- a/qpid/java/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/DerbyMessageStoreTest.java +++ b/qpid/java/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/DerbyMessageStoreTest.java @@ -70,10 +70,13 @@ public class DerbyMessageStoreTest extends MessageStoreTestCase private void deleteStoreIfExists() { - File location = new File(_storeLocation); - if (location.exists()) + if (_storeLocation != null) { - FileUtils.delete(location, true); + File location = new File(_storeLocation); + if (location.exists()) + { + FileUtils.delete(location, true); + } } } |