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

ARTEMIS-3120 Preserve default LocatorConfig if no configuration provided in RecoveryConfig

This commit is contained in:
Bartosz Spyrko-Smietanko 2021-02-15 16:28:33 +00:00 committed by Clebert Suconic
parent d2f06034cb
commit fd1ccbe135
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQXAResourceWrapper.java
View File

@ -306,7 +306,9 @@ public class ActiveMQXAResourceWrapper implements XAResource, SessionFailureList
} else { } else {
serverLocator = ActiveMQClient.createServerLocator(false, xaRecoveryConfig.getTransportConfig()); serverLocator = ActiveMQClient.createServerLocator(false, xaRecoveryConfig.getTransportConfig());
} }
serverLocator.setLocatorConfig(xaRecoveryConfig.getLocatorConfig()); if (xaRecoveryConfig.getLocatorConfig() != null) {
serverLocator.setLocatorConfig(xaRecoveryConfig.getLocatorConfig());
}
serverLocator.disableFinalizeCheck(); serverLocator.disableFinalizeCheck();
serverLocator.setProtocolManagerFactory(xaRecoveryConfig.getClientProtocolManager()); serverLocator.setProtocolManagerFactory(xaRecoveryConfig.getClientProtocolManager());
csf = serverLocator.createSessionFactory(); csf = serverLocator.createSessionFactory();