PR fixes

com2m · Feb 5, 2024 · 9602ba9 · 9602ba9
1 parent 058b075
commit 9602ba9
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/main/java/com/hivemq/security/ssl/SslContextFactory.java b/src/main/java/com/hivemq/security/ssl/SslContextFactory.java
@@ -153,12 +153,12 @@ private static Map<String, String> createDnsHostnameMap(
 
             aliases = keystore.aliases();
         } catch (final IOException | NoSuchAlgorithmException | CertificateException | KeyStoreException e) {
-            log.warn("Failed to open keystore for certificate processing");
+            log.warn("Failed to open keystore for certificate processing, the message is: {}", e.getMessage());
 
             return Collections.emptyMap();
         }
 
-        if (aliases == null) {
+        if (aliases == null || !aliases.hasMoreElements()) {
             return Collections.emptyMap();
         }
 
@@ -170,7 +170,7 @@ private static Map<String, String> createDnsHostnameMap(
             try {
                 certificateChain = keystore.getCertificateChain(alias);
             } catch (final KeyStoreException e) {
-                log.warn("Failed to get certificate with alias {} from keystore", alias);
+                log.warn("Failed to get certificate with alias {} from keystore, the message is: {}", alias, e.getMessage());
                 continue;
             }
 
@@ -186,7 +186,7 @@ private static Map<String, String> createDnsHostnameMap(
                 try {
                     dnsHostnames = getDnsHostnamesFromCertificate(x509Cert);
                 } catch (final CertificateParsingException e) {
-                    log.warn("Failed to parse certificate for alias: {}", alias);
+                    log.warn("Failed to parse certificate for alias: {}, the message is: {}", alias, e.getMessage());
                 }
 
                 if (dnsHostnames == null) {