You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2022/02/28 16:12:24 UTC
[activemq-artemis] branch main updated: ARTEMIS-3685 fix a couple more issues
This is an automated email from the ASF dual-hosted git repository.
jbertram 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 2d16ec3 ARTEMIS-3685 fix a couple more issues
2d16ec3 is described below
commit 2d16ec3305e409cbbfb57a6f21cede3d6dba76ba
Author: Justin Bertram <jb...@apache.org>
AuthorDate: Mon Feb 28 10:12:05 2022 -0600
ARTEMIS-3685 fix a couple more issues
---
.../artemis/core/server/cluster/impl/ClusterConnectionBridge.java | 3 ++-
.../apache/activemq/artemis/core/server/impl/ServiceRegistryImpl.java | 4 ++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionBridge.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionBridge.java
index 1d05897..4dfe754 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionBridge.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionBridge.java
@@ -122,6 +122,7 @@ public class ClusterConnectionBridge extends BridgeImpl {
final String storeAndForwardPrefix,
final StorageManager storageManager) throws ActiveMQException {
super(targetLocator, new BridgeConfiguration()
+ .setName(name == null ? null : name.toString())
.setInitialConnectAttempts(initialConnectAttempts)
.setReconnectAttempts(reconnectAttempts)
.setReconnectAttemptsOnSameNode(0) // reconnectAttemptsOnSameNode means nothing on the clustering bridge since we always try the same
@@ -129,7 +130,7 @@ public class ClusterConnectionBridge extends BridgeImpl {
.setRetryIntervalMultiplier(retryMultiplier)
.setMaxRetryInterval(maxRetryInterval)
.setFilterString(filterString == null ? null : filterString.toString())
- .setForwardingAddress(forwardingAddress.toString())
+ .setForwardingAddress(forwardingAddress == null ? null : forwardingAddress.toString())
.setUseDuplicateDetection(useDuplicateDetection)
.setUser(user)
.setPassword(password)
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServiceRegistryImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServiceRegistryImpl.java
index 1597e08..9581bec 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServiceRegistryImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServiceRegistryImpl.java
@@ -191,6 +191,10 @@ public class ServiceRegistryImpl implements ServiceRegistry {
@Override
public Transformer getBridgeTransformer(String name, TransformerConfiguration transformerConfiguration) {
+ if (transformerConfiguration == null) {
+ return null;
+ }
+
Transformer transformer = bridgeTransformers.get(name);
if (transformer == null && transformerConfiguration != null && transformerConfiguration.getClassName() != null) {