You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2022/10/12 21:15:52 UTC
[activemq-artemis] branch main updated: ARTEMIS-4041 Fixing NPE on SequentialFileFactory after the CriticalIO change
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 7b2f7e1707 ARTEMIS-4041 Fixing NPE on SequentialFileFactory after the CriticalIO change
7b2f7e1707 is described below
commit 7b2f7e1707ca86fee7b20513f3cf26e93c49927a
Author: Clebert Suconic <cl...@apache.org>
AuthorDate: Wed Oct 12 17:03:10 2022 -0400
ARTEMIS-4041 Fixing NPE on SequentialFileFactory after the CriticalIO change
---
.../java/org/apache/activemq/artemis/core/io/SequentialFileFactory.java | 2 +-
.../core/persistence/impl/journal/AbstractJournalStorageManager.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/SequentialFileFactory.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/SequentialFileFactory.java
index bce02d2455..fafca07ab7 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/SequentialFileFactory.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/SequentialFileFactory.java
@@ -58,7 +58,7 @@ public interface SequentialFileFactory {
void onIOError(Throwable exception, String message, String file);
default void onIOError(Throwable exception, String message, SequentialFile file) {
- onIOError(exception, message, file.getFileName());
+ onIOError(exception, message, file != null ? file.getFileName() : (String) null);
}
default void onIOError(Throwable exception, String message) {
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AbstractJournalStorageManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AbstractJournalStorageManager.java
index f18b9c2512..d7ca55888f 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AbstractJournalStorageManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AbstractJournalStorageManager.java
@@ -457,7 +457,7 @@ public abstract class AbstractJournalStorageManager extends CriticalComponentImp
private void messageUpdateCallback(long id, boolean found) {
if (!found) {
- ActiveMQServerLogger.LOGGER.cannotFindMessageOnJournal(id, new Exception());
+ ActiveMQServerLogger.LOGGER.cannotFindMessageOnJournal(id, new Exception("trace"));
}
}