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-3573 https://issues.apache.org/jira/browse/AMQ-2834 - only validate limits if they are set

This commit is contained in:
gtully 2015-10-20 12:16:28 +01:00
parent e100638244
commit dc19d28af9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java
View File

@ -1978,7 +1978,7 @@ public class BrokerService implements Service {
maxJournalFileSize = ((JournaledStore) adapter).getJournalMaxFileLength();
}
if (storeLimit < maxJournalFileSize) {
if (storeLimit > 0 && storeLimit < maxJournalFileSize) {
LOG.error("Store limit is " + storeLimit / (1024 * 1024) +
" mb, whilst the max journal file size for the store is: " +
maxJournalFileSize / (1024 * 1024) + " mb, " +
@ -2011,7 +2011,7 @@ public class BrokerService implements Service {
}
long storeLimit = usage.getTempUsage().getLimit();
if (storeLimit < maxJournalFileSize) {
if (storeLimit > 0 && storeLimit < maxJournalFileSize) {
LOG.error("Temporary Store limit is " + storeLimit / (1024 * 1024) +
" mb, whilst the max journal file size for the temporary store is: " +
maxJournalFileSize / (1024 * 1024) + " mb, " +