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 2021/02/16 13:44:37 UTC
[activemq-artemis] branch master updated: ARTEMIS-3120 Preserve
default LocatorConfig if no configuration provided in RecoveryConfig
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/master by this push:
new fd1ccbe ARTEMIS-3120 Preserve default LocatorConfig if no configuration provided in RecoveryConfig
new 34af74e This closes #3454
fd1ccbe is described below
commit fd1ccbe13553fab16b12f8a687a58c703e55b50e
Author: Bartosz Spyrko-Smietanko <bs...@redhat.com>
AuthorDate: Mon Feb 15 16:28:33 2021 +0000
ARTEMIS-3120 Preserve default LocatorConfig if no configuration provided in RecoveryConfig
---
.../service/extensions/xa/recovery/ActiveMQXAResourceWrapper.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQXAResourceWrapper.java b/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQXAResourceWrapper.java
index e11b388..146a722 100644
--- a/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQXAResourceWrapper.java
+++ b/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQXAResourceWrapper.java
@@ -306,7 +306,9 @@ public class ActiveMQXAResourceWrapper implements XAResource, SessionFailureList
} else {
serverLocator = ActiveMQClient.createServerLocator(false, xaRecoveryConfig.getTransportConfig());
}
- serverLocator.setLocatorConfig(xaRecoveryConfig.getLocatorConfig());
+ if (xaRecoveryConfig.getLocatorConfig() != null) {
+ serverLocator.setLocatorConfig(xaRecoveryConfig.getLocatorConfig());
+ }
serverLocator.disableFinalizeCheck();
serverLocator.setProtocolManagerFactory(xaRecoveryConfig.getClientProtocolManager());
csf = serverLocator.createSessionFactory();