diff options
| author | Robert Godfrey <rgodfrey@apache.org> | 2012-05-07 23:17:39 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org> | 2012-05-07 23:17:39 +0000 |
| commit | afba2341cf8b746f786d89b8952cff33e7d2d4e6 (patch) | |
| tree | e3d23a3e55e92fdc6e94e46873b883574619e0f0 /java/broker | |
| parent | 5dfe383edf1781c14daa03abd88ae491654074e9 (diff) | |
| download | qpid-python-afba2341cf8b746f786d89b8952cff33e7d2d4e6.tar.gz | |
QPID-3986 : [Java Broker] Tidy up constant use for Underfull/Overfull properties
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1335301 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/broker')
| -rw-r--r-- | java/broker/src/main/java/org/apache/qpid/server/store/MessageStoreConstants.java | 2 | ||||
| -rw-r--r-- | java/broker/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStore.java | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/java/broker/src/main/java/org/apache/qpid/server/store/MessageStoreConstants.java b/java/broker/src/main/java/org/apache/qpid/server/store/MessageStoreConstants.java index aba7456a44..728da23f28 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/store/MessageStoreConstants.java +++ b/java/broker/src/main/java/org/apache/qpid/server/store/MessageStoreConstants.java @@ -23,5 +23,7 @@ public class MessageStoreConstants { public static final String ENVIRONMENT_PATH_PROPERTY = "environment-path"; + public static final String OVERFULL_SIZE_PROPERTY = "overfull-size"; + public static final String UNDERFULL_SIZE_PROPERTY = "underfull-size"; } diff --git a/java/broker/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStore.java b/java/broker/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStore.java index 36351cc426..480da2246c 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStore.java +++ b/java/broker/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStore.java @@ -90,9 +90,6 @@ public class DerbyMessageStore implements MessageStore private static final Logger _logger = Logger.getLogger(DerbyMessageStore.class); - public static final String OVERFULL_SIZE_PROPERTY = "overfull-size"; - public static final String UNDERFULL_SIZE_PROPERTY = "underfull-size"; - private static final String SQL_DRIVER_NAME = "org.apache.derby.jdbc.EmbeddedDriver"; private static final String DB_VERSION_TABLE_NAME = "QPID_DB_VERSION"; @@ -235,7 +232,7 @@ public class DerbyMessageStore implements MessageStore private static final String DERBY_SINGLE_DB_SHUTDOWN_CODE = "08006"; private final StateManager _stateManager; - + private final EventManager _eventManager = new EventManager(); private long _totalStoreSize; @@ -317,8 +314,8 @@ public class DerbyMessageStore implements MessageStore _storeLocation = databasePath; - _persistentSizeHighThreshold = storeConfiguration.getLong(OVERFULL_SIZE_PROPERTY, -1l); - _persistentSizeLowThreshold = storeConfiguration.getLong(UNDERFULL_SIZE_PROPERTY, _persistentSizeHighThreshold); + _persistentSizeHighThreshold = storeConfiguration.getLong(MessageStoreConstants.OVERFULL_SIZE_PROPERTY, -1l); + _persistentSizeLowThreshold = storeConfiguration.getLong(MessageStoreConstants.UNDERFULL_SIZE_PROPERTY, _persistentSizeHighThreshold); if(_persistentSizeLowThreshold > _persistentSizeHighThreshold || _persistentSizeLowThreshold < 0l) { _persistentSizeLowThreshold = _persistentSizeHighThreshold; |