diff options
| author | Keith Wall <kwall@apache.org> | 2014-03-18 11:36:12 +0000 |
|---|---|---|
| committer | Keith Wall <kwall@apache.org> | 2014-03-18 11:36:12 +0000 |
| commit | e6e54ec4b4e82946a81e713e48eb1d4e60d31586 (patch) | |
| tree | 0b66782ff4f20b7d6442ee04d89a54aa5b40e606 | |
| parent | e5e3a215f30176a60661ad263331df1f5f3f896d (diff) | |
| download | qpid-python-e6e54ec4b4e82946a81e713e48eb1d4e60d31586.tar.gz | |
QPID-5624: Bug fix - derby must allow absence of configuration store settings
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-broker-bdb-ha2@1578832 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStoreFactory.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStoreFactory.java b/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStoreFactory.java index a3610901c5..e7a330102e 100644 --- a/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStoreFactory.java +++ b/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStoreFactory.java @@ -68,7 +68,7 @@ public class DerbyMessageStoreFactory implements MessageStoreFactory, DurableCon @SuppressWarnings("unchecked") Map<String, Object> configurationStoreSettings = (Map<String, Object>) attributes.get(VirtualHost.CONFIGURATION_STORE_SETTINGS); - if(getType().equals(configurationStoreSettings.get(DurableConfigurationStore.STORE_TYPE))) + if(configurationStoreSettings != null && getType().equals(configurationStoreSettings.get(DurableConfigurationStore.STORE_TYPE))) { Object storePath = configurationStoreSettings.get(DurableConfigurationStore.STORE_PATH); if(!(storePath instanceof String)) |