qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From oru...@apache.org
Subject [3/6] qpid-broker-j git commit: QPID-8253: [Broker-J] Hanlde null server names returned from SSLEngine SSLParameters
Date Tue, 30 Oct 2018 16:32:57 GMT
QPID-8253: [Broker-J] Hanlde null server names returned from SSLEngine SSLParameters


Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/4ebae174
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/4ebae174
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/4ebae174

Branch: refs/heads/master
Commit: 4ebae1747328e19519fa670974dfac92fb852a71
Parents: bb57b51
Author: Alex Rudyy <orudyy@apache.org>
Authored: Tue Oct 30 14:45:59 2018 +0000
Committer: Alex Rudyy <orudyy@apache.org>
Committed: Tue Oct 30 16:32:41 2018 +0000

----------------------------------------------------------------------
 .../transport/network/security/ssl/QpidBestFitX509KeyManager.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/4ebae174/broker-core/src/main/java/org/apache/qpid/server/transport/network/security/ssl/QpidBestFitX509KeyManager.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/transport/network/security/ssl/QpidBestFitX509KeyManager.java
b/broker-core/src/main/java/org/apache/qpid/server/transport/network/security/ssl/QpidBestFitX509KeyManager.java
index 3cb06ac..e7e00a7 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/transport/network/security/ssl/QpidBestFitX509KeyManager.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/transport/network/security/ssl/QpidBestFitX509KeyManager.java
@@ -120,7 +120,7 @@ public class QpidBestFitX509KeyManager extends X509ExtendedKeyManager
     {
         Date currentDate = new Date();
         final List<SNIServerName> serverNames = engine.getSSLParameters().getServerNames();
-        if(serverNames.isEmpty())
+        if(serverNames == null || serverNames.isEmpty())
         {
             return getDefaultServerAlias(keyType, issuers, engine);
         }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message