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

ARTEMIS-3073 Improve replication manger NPE logs

This commit is contained in:
Domenico Francesco Bruscino 2021-01-18 15:51:11 +01:00 committed by Clebert Suconic
parent d3c6fb62b8
commit eea619137f
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalStorageManager.java
View File

@ -593,7 +593,13 @@ public class JournalStorageManager extends AbstractJournalStorageManager {
for (JournalFile jf : journalFiles) {
if (!started)
return;
replicator.syncJournalFile(jf, type);
ReplicationManager replicatorInUse = replicator;
if (replicatorInUse == null) {
throw ActiveMQMessageBundle.BUNDLE.replicatorIsNull();
}
replicatorInUse.syncJournalFile(jf, type);
}
}
@ -724,11 +730,13 @@ public class JournalStorageManager extends AbstractJournalStorageManager {
SequentialFile seqFile = largeMessagesFactory.createSequentialFile(fileName);
if (!seqFile.exists())
continue;
if (replicator != null) {
replicator.syncLargeMessageFile(seqFile, size, id);
} else {
ReplicationManager replicatorInUse = replicator;
if (replicatorInUse == null) {
throw ActiveMQMessageBundle.BUNDLE.replicatorIsNull();
}
replicatorInUse.syncLargeMessageFile(seqFile, size, id);
}
}
@ -796,8 +804,14 @@ public class JournalStorageManager extends AbstractJournalStorageManager {
for (Map.Entry<SimpleString, Collection<Integer>> entry : pageFilesToSync.entrySet()) {
if (!started)
return;
ReplicationManager replicatorInUse = replicator;
if (replicatorInUse == null) {
throw ActiveMQMessageBundle.BUNDLE.replicatorIsNull();
}
PagingStore store = manager.getPageStore(entry.getKey());
store.sendPages(replicator, entry.getValue());
store.sendPages(replicatorInUse, entry.getValue());
}
}