Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

https://issues.apache.org/jira/browse/AMQ-5393 

Reverting commit because allowing 0 doesn't actually set the usage to
0 size.  It ends up disabling the check all together which was the
opposite intention of the commit.

This reverts commit 3b658f8e1a.
This commit is contained in:
Christopher L. Shannon (cshannon) 2015-11-25 17:59:41 +00:00
parent 8f30866fdf
commit 29d943429c
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
activemq-broker/src/main/java/org/apache/activemq/usage/StoreUsage.java
View File

@ -96,7 +96,8 @@ public class StoreUsage extends PercentLimitUsage<StoreUsage> {
protected void updateLimitBasedOnPercent() { protected void updateLimitBasedOnPercent() {
usageLock.writeLock().lock(); usageLock.writeLock().lock();
try { try {
if (percentLimit >= 0 && store != null) {
if (percentLimit > 0 && store != null) {
File dir = StoreUtil.findParentDirectory(store.getDirectory()); File dir = StoreUtil.findParentDirectory(store.getDirectory());
if (dir != null) { if (dir != null) {

2
activemq-broker/src/main/java/org/apache/activemq/usage/TempUsage.java
View File

@ -76,7 +76,7 @@ public class TempUsage extends PercentLimitUsage<TempUsage> {
protected void updateLimitBasedOnPercent() { protected void updateLimitBasedOnPercent() {
usageLock.writeLock().lock(); usageLock.writeLock().lock();
try { try {
if (percentLimit >= 0 && store != null) { if (percentLimit > 0 && store != null) {
File dir = StoreUtil.findParentDirectory(store.getDirectory()); File dir = StoreUtil.findParentDirectory(store.getDirectory());
if (dir != null) { if (dir != null) {