Skip to content

Commit dc4bf95

Browse files
jbertramgemmellr
authored andcommitted
ARTEMIS-4319 mitigate NPE in paging log statement
Also improves the wording of some several related statements.
1 parent 7ff5f47 commit dc4bf95

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1573,13 +1573,13 @@ void slowConsumerDetected(String sessionID,
15731573
@LogMessage(id = 224122, value = "Address {} number of messages is under page limit again, and it should be allowed to page again.", level = LogMessage.Level.INFO)
15741574
void pageFree(SimpleString address);
15751575

1576-
@LogMessage(id = 224123, value = "Address {} has more pages than allowed. System currently has {} pages, while the estimated max number of pages is {}, based on the limitPageBytes ({}) / page-size ({})", level = LogMessage.Level.WARN)
1577-
void pageFullMaxBytes(SimpleString address, long pages, long maxPages, long limitBytes, long bytes);
1576+
@LogMessage(id = 224123, value = "Address {} has more pages than allowed. System currently has {} pages, while the estimated max number of pages is {} based on the page-limit-bytes ({}) / page-size ({})", level = LogMessage.Level.WARN)
1577+
void pageFullMaxBytes(SimpleString address, long pages, Long maxPages, Long limitBytes, int bytes);
15781578

1579-
@LogMessage(id = 224124, value = "Address {} has a pageFullPolicy set as {} but there are not page-limit-bytes or page-limit-messages set. Page full configuration being ignored on this address.", level = LogMessage.Level.WARN)
1579+
@LogMessage(id = 224124, value = "Address {} has page-full-policy={} but neither page-limit-bytes nor page-limit-messages are set. Page full configuration being ignored on this address.", level = LogMessage.Level.WARN)
15801580
void noPageLimitsSet(Object address, Object policy);
15811581

1582-
@LogMessage(id = 224125, value = "Address {} has page-limit-bytes={}, page-limit-messages={} and no page-full-policy set. Page full configuration being ignored on this address", level = LogMessage.Level.WARN)
1582+
@LogMessage(id = 224125, value = "Address {} has page-limit-bytes={} and page-limit-messages={} but no page-full-policy set. Page full configuration being ignored on this address", level = LogMessage.Level.WARN)
15831583
void noPagefullPolicySet(Object address, Object limitBytes, Object limitMessages);
15841584

15851585
}

0 commit comments

Comments
 (0)