This closes #226
This commit is contained in:
commit
667a64f0ac
|
@ -205,15 +205,7 @@ public class RemotingServiceImpl implements RemotingService, ConnectionLifeCycle
|
|||
|
||||
threadPool = Executors.newCachedThreadPool(tFactory);
|
||||
|
||||
HashSet<TransportConfiguration> namelessAcceptors = new HashSet<>();
|
||||
|
||||
for (TransportConfiguration info : acceptorsConfig) {
|
||||
TransportConfiguration nameless = info.newTransportConfig("");
|
||||
if (namelessAcceptors.contains(nameless)) {
|
||||
ActiveMQServerLogger.LOGGER.duplicatedAcceptor(info.getName(), "" + info.getParams(), info.getFactoryClassName());
|
||||
continue;
|
||||
}
|
||||
namelessAcceptors.add(nameless);
|
||||
try {
|
||||
AcceptorFactory factory = server.getServiceRegistry().getAcceptorFactory(info.getName(), info.getFactoryClassName());
|
||||
|
||||
|
|
|
@ -0,0 +1,56 @@
|
|||
/*
|
||||
* 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.artemis.tests.unit.core.remoting;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import org.apache.activemq.artemis.api.core.TransportConfiguration;
|
||||
import org.apache.activemq.artemis.core.config.Configuration;
|
||||
import org.apache.activemq.artemis.core.server.ActiveMQServer;
|
||||
import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
|
||||
import org.junit.Test;
|
||||
|
||||
public class AcceptorsTest extends ActiveMQTestBase {
|
||||
|
||||
@Test
|
||||
public void testMultipleAcceptorsWithSameHostPortDifferentName() throws Exception
|
||||
{
|
||||
final String acceptorFactoryClass = "org.apache.activemq.artemis.tests.unit.core.remoting.server.impl.fake.FakeAcceptorFactory";
|
||||
|
||||
Map<String, Object> params = new HashMap<>();
|
||||
params.put("host", "localhost");
|
||||
params.put("port", 5445);
|
||||
|
||||
Set<TransportConfiguration> tcs = new HashSet<>();
|
||||
tcs.add(new TransportConfiguration(acceptorFactoryClass, params, "Acceptor1"));
|
||||
tcs.add(new TransportConfiguration(acceptorFactoryClass, params, "Acceptor2"));
|
||||
|
||||
Configuration config = createBasicConfig();
|
||||
config.setAcceptorConfigurations(tcs);
|
||||
|
||||
ActiveMQServer server = createServer(config);
|
||||
|
||||
server.start();
|
||||
waitForServerToStart(server);
|
||||
|
||||
assertNotNull(server.getRemotingService().getAcceptor("Acceptor1"));
|
||||
assertNotNull(server.getRemotingService().getAcceptor("Acceptor2"));
|
||||
}
|
||||
}
|
|
@ -0,0 +1,95 @@
|
|||
/*
|
||||
* 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.artemis.tests.unit.core.remoting.server.impl.fake;
|
||||
|
||||
import java.util.Map;
|
||||
import java.util.concurrent.Executor;
|
||||
import java.util.concurrent.ScheduledExecutorService;
|
||||
|
||||
import org.apache.activemq.artemis.core.security.ActiveMQPrincipal;
|
||||
import org.apache.activemq.artemis.core.server.cluster.ClusterConnection;
|
||||
import org.apache.activemq.artemis.core.server.management.NotificationService;
|
||||
import org.apache.activemq.artemis.spi.core.protocol.ProtocolManager;
|
||||
import org.apache.activemq.artemis.spi.core.remoting.Acceptor;
|
||||
import org.apache.activemq.artemis.spi.core.remoting.AcceptorFactory;
|
||||
import org.apache.activemq.artemis.spi.core.remoting.BufferHandler;
|
||||
import org.apache.activemq.artemis.spi.core.remoting.ConnectionLifeCycleListener;
|
||||
|
||||
public class FakeAcceptorFactory implements AcceptorFactory {
|
||||
|
||||
private boolean started = false;
|
||||
|
||||
@Override
|
||||
public Acceptor createAcceptor(String name,
|
||||
ClusterConnection clusterConnection,
|
||||
Map<String, Object> configuration,
|
||||
BufferHandler handler,
|
||||
ConnectionLifeCycleListener listener,
|
||||
Executor threadPool,
|
||||
ScheduledExecutorService scheduledThreadPool,
|
||||
Map<String, ProtocolManager> protocolMap) {
|
||||
return new FakeAcceptor();
|
||||
}
|
||||
|
||||
private final class FakeAcceptor implements Acceptor {
|
||||
|
||||
@Override
|
||||
public void pause() {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public ClusterConnection getClusterConnection() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<String, Object> getConfiguration() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setNotificationService(NotificationService notificationService) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setDefaultActiveMQPrincipal(ActiveMQPrincipal defaultActiveMQPrincipal) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isUnsecurable() {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void start() throws Exception {
|
||||
started = true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void stop() throws Exception {
|
||||
started = false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isStarted() {
|
||||
return started;
|
||||
}
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue