| commit | 4ebae1747328e19519fa670974dfac92fb852a71 | [log] [tgz] |
|---|---|---|
| author | Alex Rudyy <orudyy@apache.org> | Tue Oct 30 14:45:59 2018 +0000 |
| committer | Alex Rudyy <orudyy@apache.org> | Tue Oct 30 16:32:41 2018 +0000 |
| tree | 5fceaaf7205d58c9b57342593a1b4c3686ebec9f | |
| parent | bb57b51593128b31c796f80cba249f9a3e126177 [diff] |
QPID-8253: [Broker-J] Hanlde null server names returned from SSLEngine SSLParameters
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 @@ { Date currentDate = new Date(); final List<SNIServerName> serverNames = engine.getSSLParameters().getServerNames(); - if(serverNames.isEmpty()) + if(serverNames == null || serverNames.isEmpty()) { return getDefaultServerAlias(keyType, issuers, engine); }