Author: kwall
Date: Thu Dec 8 18:54:20 2016
New Revision: 1773281
URL: http://svn.apache.org/viewvc?rev=1773281&view=rev
Log:
QPID-7310: [Java Broker] SiteSpecificTrustStore use the protocol's default port
if the user supplied url has none
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/SiteSpecificTrustStoreImpl.java
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/SiteSpecificTrustStoreImpl.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/SiteSpecificTrustStoreImpl.java?rev=1773281&r1=1773280&r2=1773281&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/SiteSpecificTrustStoreImpl.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/SiteSpecificTrustStoreImpl.java
Thu Dec 8 18:54:20 2016
@@ -227,7 +227,8 @@ public class SiteSpecificTrustStoreImpl
SSLContext sslContext = SSLUtil.tryGetSSLContext();
sslContext.init(new KeyManager[0], new TrustManager[] {new
AlwaysTrustManager()}, null);
- try(SSLSocket socket = (SSLSocket)
sslContext.getSocketFactory().createSocket(url.getHost(), url.getPort()))
+ final int port = url.getPort() == -1 ? url.getDefaultPort() :
url.getPort();
+ try(SSLSocket socket = (SSLSocket)
sslContext.getSocketFactory().createSocket(url.getHost(), port))
{
socket.startHandshake();
final Certificate[] certificateChain =
socket.getSession().getPeerCertificates();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
