diff options
| author | Robert Godfrey <rgodfrey@apache.org> | 2014-11-08 23:31:54 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org> | 2014-11-08 23:31:54 +0000 |
| commit | bbe46feac2364d99c01fe96562140c6f9fa3a9de (patch) | |
| tree | d5b1e2d0a95f4bf25bf7002d3caeed75948a83a8 /qpid/java | |
| parent | acdb57af871cbfef3a768b2dd765246063129d5d (diff) | |
| download | qpid-python-bbe46feac2364d99c01fe96562140c6f9fa3a9de.tar.gz | |
QPID-6221 : [Java Broker] Fix existing bug in getStoreLocation() in provided stores, remove unneeded extra Event enums
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1637609 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
3 files changed, 3 insertions, 5 deletions
diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfigurationStore.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfigurationStore.java index 409679c2de..f082c23c8a 100644 --- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfigurationStore.java +++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfigurationStore.java @@ -565,7 +565,7 @@ public class BDBConfigurationStore implements MessageStoreProvider, DurableConfi @Override public String getStoreLocation() { - return ((FileBasedSettings)_parent).getStorePath(); + return ((FileBasedSettings)(BDBConfigurationStore.this._parent)).getStorePath(); } @Override diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/Event.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/Event.java index ae35816516..a9a5ea8086 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/Event.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/Event.java @@ -22,7 +22,5 @@ package org.apache.qpid.server.store; public enum Event { PERSISTENT_MESSAGE_SIZE_OVERFULL, - PERSISTENT_MESSAGE_SIZE_UNDERFULL, - FILESYSTEM_OVERFULL, - FILESYSTEM_UNDERFULL + PERSISTENT_MESSAGE_SIZE_UNDERFULL } diff --git a/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyConfigurationStore.java b/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyConfigurationStore.java index 2764597bd0..82802ec7ae 100644 --- a/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyConfigurationStore.java +++ b/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyConfigurationStore.java @@ -217,7 +217,7 @@ public class DerbyConfigurationStore extends AbstractJDBCConfigurationStore @Override public String getStoreLocation() { - return ((FileBasedSettings)_parent).getStorePath(); + return ((FileBasedSettings)(DerbyConfigurationStore.this._parent)).getStorePath(); } @Override |