diff options
| author | Keith Wall <kwall@apache.org> | 2014-12-10 17:17:24 +0000 |
|---|---|---|
| committer | Keith Wall <kwall@apache.org> | 2014-12-10 17:17:24 +0000 |
| commit | 5cce2b1fbd0d00486106d0cf9d734972f856ee6c (patch) | |
| tree | 424e55e01b0e18428c6246b90ec345ddafadf53a /qpid/java/broker-core/src | |
| parent | 129a9e7cece9fe18e9cf1fddf9401e78db36c9cd (diff) | |
| download | qpid-python-5cce2b1fbd0d00486106d0cf9d734972f856ee6c.tar.gz | |
Reenable support for SSL and Plain on the same port (i.e. the transport sniffing). Reenable all TLS tests
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-6262-JavaBrokerNIO@1644485 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker-core/src')
| -rw-r--r-- | qpid/java/broker-core/src/main/java/org/apache/qpid/server/transport/TCPandSSLTransport.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/transport/TCPandSSLTransport.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/transport/TCPandSSLTransport.java index 50f37bb404..cd50998609 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/transport/TCPandSSLTransport.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/transport/TCPandSSLTransport.java @@ -99,8 +99,7 @@ class TCPandSSLTransport implements AcceptingTransport { encryptionSet.add(TransportEncryption.TLS); } - _networkTransport.accept(settings, protocolEngineFactory, _transports.contains(Transport.TCP) ? null : _sslContext, - encryptionSet); + _networkTransport.accept(settings, protocolEngineFactory, _sslContext, encryptionSet); } public int getAcceptingPort() |