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

Merge pull request #621 from cshannon/AMQ-8184 

AMQ-8184 - Re-enable NIO tests
This commit is contained in:
Jean-Baptiste Onofré 2021-03-15 07:55:36 +01:00 committed by GitHub
parent 3ecce8beea 2cf3decd8e
commit 963bea2ddb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activemq-broker/src/main/java/org/apache/activemq/broker/TransportConnector.java
View File

@ -266,7 +266,7 @@ public class TransportConnector implements Connector, BrokerServiceAware {
LOG.info("Connector {} started", getName()); LOG.info("Connector {} started", getName());
} }
static Throwable getRootCause(final Throwable throwable) { public static Throwable getRootCause(final Throwable throwable) {
final List<Throwable> list = getThrowableList(throwable); final List<Throwable> list = getThrowableList(throwable);
return list.isEmpty() ? null : list.get(list.size() - 1); return list.isEmpty() ? null : list.get(list.size() - 1);
} }

11
activemq-broker/src/main/java/org/apache/activemq/transport/auto/nio/AutoNIOSSLTransportServer.java
View File

@ -15,6 +15,7 @@ import javax.net.ssl.SSLEngine;
import org.apache.activemq.broker.BrokerService; import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.broker.BrokerServiceAware; import org.apache.activemq.broker.BrokerServiceAware;
import org.apache.activemq.broker.TransportConnector;
import org.apache.activemq.transport.Transport; import org.apache.activemq.transport.Transport;
import org.apache.activemq.transport.auto.AutoTcpTransportServer; import org.apache.activemq.transport.auto.AutoTcpTransportServer;
import org.apache.activemq.transport.nio.AutoInitNioSSLTransport; import org.apache.activemq.transport.nio.AutoInitNioSSLTransport;
@ -25,6 +26,8 @@ import org.apache.activemq.transport.tcp.TcpTransportFactory;
import org.apache.activemq.transport.tcp.TcpTransportServer; import org.apache.activemq.transport.tcp.TcpTransportServer;
import org.apache.activemq.util.IntrospectionSupport; import org.apache.activemq.util.IntrospectionSupport;
import org.apache.activemq.wireformat.WireFormat; import org.apache.activemq.wireformat.WireFormat;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/** /**
* Licensed to the Apache Software Foundation (ASF) under one or more * Licensed to the Apache Software Foundation (ASF) under one or more
@ -44,6 +47,7 @@ import org.apache.activemq.wireformat.WireFormat;
*/ */
public class AutoNIOSSLTransportServer extends AutoTcpTransportServer { public class AutoNIOSSLTransportServer extends AutoTcpTransportServer {
private static final Logger LOG = LoggerFactory.getLogger(AutoNIOSSLTransportServer.class);
private SSLContext context; private SSLContext context;
public AutoNIOSSLTransportServer(SSLContext context, TcpTransportFactory transportFactory, URI location, ServerSocketFactory serverSocketFactory, public AutoNIOSSLTransportServer(SSLContext context, TcpTransportFactory transportFactory, URI location, ServerSocketFactory serverSocketFactory,
@ -118,8 +122,11 @@ public class AutoNIOSSLTransportServer extends AutoTcpTransportServer {
public void run() { public void run() {
try { try {
in.start(); in.start();
} catch (Exception e) { } catch (Exception error) {
throw new IllegalStateException("Could not complete Transport start", e); LOG.warn("Could not accept connection {}: {} ({})",
(in.getRemoteAddress() == null ? "" : "from " + in.getRemoteAddress()), error.getMessage(),
TransportConnector.getRootCause(error).getMessage());
throw new IllegalStateException("Could not complete Transport start", error);
} }
int attempts = 0; int attempts = 0;

2
activemq-unit-tests/pom.xml
View File

@ -654,8 +654,6 @@
<exclude>**/SSHTunnelNetworkReconnectTest.*</exclude> <exclude>**/SSHTunnelNetworkReconnectTest.*</exclude>
<!-- http://issues.apache.org/activemq/browse/AMQ-1027 --> <!-- http://issues.apache.org/activemq/browse/AMQ-1027 -->
<exclude>**/FailoverConsumerTest.*</exclude> <exclude>**/FailoverConsumerTest.*</exclude>
<!-- The NIO implemenation is not working properly on OS X.. -->
<exclude>**/nio/**</exclude>
<exclude>**/NioQueueSubscriptionTest.*/</exclude> <exclude>**/NioQueueSubscriptionTest.*/</exclude>
<!-- A test used for memory profiling only. --> <!-- A test used for memory profiling only. -->
<exclude>**/NetworkConnectionsCleanedupTest.*/**</exclude> <exclude>**/NetworkConnectionsCleanedupTest.*/**</exclude>

2
activemq-unit-tests/src/test/java/org/apache/activemq/transport/nio/NIOSSLBasicTest.java
View File

@ -117,7 +117,7 @@ public class NIOSSLBasicTest {
final DefaultTestAppender appender = new DefaultTestAppender() { final DefaultTestAppender appender = new DefaultTestAppender() {
@Override @Override
public void doAppend(LoggingEvent event) { public void doAppend(LoggingEvent event) {
if (event.getLevel().equals(Level.ERROR) && event.getRenderedMessage().contains("Could not accept connection")) { if (event.getLevel().equals(Level.WARN) && event.getRenderedMessage().contains("Could not accept connection")) {
gotLogMessage.countDown(); gotLogMessage.countDown();
if (event.getRenderedMessage().contains("tcp")) { if (event.getRenderedMessage().contains("tcp")) {
// got remote address // got remote address

2
activemq-unit-tests/src/test/java/org/apache/activemq/transport/nio/NIOSSLConcurrencyTest.java
View File

@ -70,7 +70,7 @@ public class NIOSSLConcurrencyTest extends TestCase {
broker = new BrokerService(); broker = new BrokerService();
broker.setPersistent(false); broker.setPersistent(false);
broker.setUseJmx(false); broker.setUseJmx(false);
TransportConnector connector = broker.addConnector("nio+ssl://localhost:0?transport.needClientAuth=true&transport.enabledCipherSuites=SSL_RSA_WITH_RC4_128_SHA,SSL_DH_anon_WITH_3DES_EDE_CBC_SHA"); TransportConnector connector = broker.addConnector("nio+ssl://localhost:0?socket.verifyHostName=false&transport.needClientAuth=true");
broker.start(); broker.start();
broker.waitUntilStarted(); broker.waitUntilStarted();