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

ARTEMIS-3685 fix a couple more issues

This commit is contained in:
Justin Bertram 2022-02-28 10:12:05 -06:00
parent b5c25e871c
commit 2d16ec3305
No known key found for this signature in database
GPG Key ID: F41830B875BB8633
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionBridge.java
View File

@ -122,6 +122,7 @@ public class ClusterConnectionBridge extends BridgeImpl {
final String storeAndForwardPrefix, final String storeAndForwardPrefix,
final StorageManager storageManager) throws ActiveMQException { final StorageManager storageManager) throws ActiveMQException {
super(targetLocator, new BridgeConfiguration() super(targetLocator, new BridgeConfiguration()
.setName(name == null ? null : name.toString())
.setInitialConnectAttempts(initialConnectAttempts) .setInitialConnectAttempts(initialConnectAttempts)
.setReconnectAttempts(reconnectAttempts) .setReconnectAttempts(reconnectAttempts)
.setReconnectAttemptsOnSameNode(0) // reconnectAttemptsOnSameNode means nothing on the clustering bridge since we always try the same .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) .setRetryIntervalMultiplier(retryMultiplier)
.setMaxRetryInterval(maxRetryInterval) .setMaxRetryInterval(maxRetryInterval)
.setFilterString(filterString == null ? null : filterString.toString()) .setFilterString(filterString == null ? null : filterString.toString())
.setForwardingAddress(forwardingAddress.toString()) .setForwardingAddress(forwardingAddress == null ? null : forwardingAddress.toString())
.setUseDuplicateDetection(useDuplicateDetection) .setUseDuplicateDetection(useDuplicateDetection)
.setUser(user) .setUser(user)
.setPassword(password) .setPassword(password)

4
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServiceRegistryImpl.java
View File

@ -191,6 +191,10 @@ public class ServiceRegistryImpl implements ServiceRegistry {
@Override @Override
public Transformer getBridgeTransformer(String name, TransformerConfiguration transformerConfiguration) { public Transformer getBridgeTransformer(String name, TransformerConfiguration transformerConfiguration) {
if (transformerConfiguration == null) {
return null;
}
Transformer transformer = bridgeTransformers.get(name); Transformer transformer = bridgeTransformers.get(name);
if (transformer == null && transformerConfiguration != null && transformerConfiguration.getClassName() != null) { if (transformer == null && transformerConfiguration != null && transformerConfiguration.getClassName() != null) {