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

This closes #91 - renaming class for compatibility with older clients

This commit is contained in:
Clebert Suconic 2015-02-11 12:40:37 -05:00
parent 33addb4086 08e7c89301
commit 05ef25798c
2 changed files with 55 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/BackwardsCompatibilityUtils.java Normal file
View File

@ -0,0 +1,52 @@
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq.core.protocol.core.impl;
import org.apache.activemq.api.core.Pair;
import org.apache.activemq.api.core.TransportConfiguration;
import org.apache.activemq.api.core.client.TopologyMember;
/**
* This is a utility class to house any HornetQ client specific backwards compatibility methods.
*
* @author mtaylor
*/
public class BackwardsCompatibilityUtils
{
private static int INITIAL_ACTIVEMQ_INCREMENTING_VERSION = 126;
public static Pair<TransportConfiguration, TransportConfiguration> getTCPair(int clientIncrementingVersion, TopologyMember member)
{
if (clientIncrementingVersion < INITIAL_ACTIVEMQ_INCREMENTING_VERSION)
{
return new Pair<>(replaceClassName(member.getLive()), replaceClassName(member.getBackup()));
}
return new Pair<>(member.getLive(), member.getBackup());
}
private static TransportConfiguration replaceClassName(TransportConfiguration tc)
{
if (tc != null)
{
String className = tc.getFactoryClassName().replace("org.apache.activemq", "org.hornetq").replace("ActiveMQ", "HornetQ");
return new TransportConfiguration(className, tc.getParams(), tc.getName());
}
return tc;
}
}

6
activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/CoreProtocolManager.java
View File

@ -234,9 +234,9 @@ class CoreProtocolManager implements ProtocolManager
{
try
{
final Pair<TransportConfiguration, TransportConfiguration> connectorPair =
new Pair<TransportConfiguration, TransportConfiguration>(topologyMember.getLive(),
topologyMember.getBackup());
final Pair<TransportConfiguration, TransportConfiguration> connectorPair = BackwardsCompatibilityUtils
.getTCPair(channel0.getConnection().getClientVersion(), topologyMember);
final String nodeID = topologyMember.getNodeId();
// Using an executor as most of the notifications on the Topology
// may come from a channel itself