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

ARTEMIS-151 Fixing tests

This commit is contained in:
Clebert Suconic 2015-10-07 18:48:26 -04:00
parent 9d3866471b
commit c3448e7029
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/TransportConfiguration.java
View File

@ -105,6 +105,10 @@ public class TransportConfiguration implements Serializable {
this.name = name;
}
public TransportConfiguration newTransportConfig(String newName) {
return new TransportConfiguration(factoryClassName, params, newName);
}
/**
* Creates a TransportConfiguration providing the class name of the {@link org.apache.activemq.artemis.spi.core.remoting.ConnectorFactory}
* and any parameters needed.

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

@ -73,6 +73,11 @@ import org.apache.activemq.artemis.utils.TypedProperties;
public final class ClusterConnectionImpl implements ClusterConnection, AfterConnectInternalListener {
/** When getting member on node-up and down we have to remove the name from the transport config
* as the setting we build here doesn't need to consider the name, so use the same name on all
* the instances. */
private static final String TRANSPORT_CONFIG_NAME = "topology-member";
private static final boolean isTrace = ActiveMQServerLogger.LOGGER.isTraceEnabled();
private final ExecutorFactory executorFactory;
@ -258,7 +263,9 @@ public final class ClusterConnectionImpl implements ClusterConnection, AfterConn
// a cluster connection will connect to other nodes only if they are directly connected
// through a static list of connectors or broadcasting using UDP.
if (allowDirectConnectionsOnly) {
allowableConnections.addAll(Arrays.asList(staticTranspConfigs));
for (TransportConfiguration configuration : staticTranspConfigs) {
allowableConnections.add(configuration.newTransportConfig(TRANSPORT_CONFIG_NAME));
}
}
}
@ -638,7 +645,7 @@ public final class ClusterConnectionImpl implements ClusterConnection, AfterConn
}
// if the node is more than 1 hop away, we do not create a bridge for direct cluster connection
if (allowDirectConnectionsOnly && !allowableConnections.contains(topologyMember.getLive())) {
if (allowDirectConnectionsOnly && !allowableConnections.contains(topologyMember.getLive().newTransportConfig(TRANSPORT_CONFIG_NAME))) {
return;
}