1 files changed, 8 insertions, 3 deletions
diff --git a/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/http/EaafSslKeySelectionStrategy.java b/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/http/EaafSslKeySelectionStrategy.java
index 1e1e2137..d2377d69 100644
--- a/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/http/EaafSslKeySelectionStrategy.java
+++ b/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/http/EaafSslKeySelectionStrategy.java
@@ -33,18 +33,23 @@ public class EaafSslKeySelectionStrategy implements PrivateKeyStrategy {
   @Override
   public String chooseAlias(Map<String, PrivateKeyDetails> aliases, Socket socket) {
     log.trace("Selection SSL client-auth key for alias: {}", keyAlias);
+    if (aliases.keySet().isEmpty()) {
+      log.debug("No Key with Alias: {} in empty KeyStore", keyAlias);
+      return null;
+      
+    }
+    
     final PrivateKeyDetails selected = aliases.get(keyAlias);
     if (selected != null) {
       log.trace("Select SL client-auth key with type:", selected.getType());
       return keyAlias;
 
-    } else {
+    } else {     
       log.warn("KeyStore contains NO key with alias: {}. Using first key from keystore", keyAlias);
       log.info("Available aliases: {}", StringUtils.join(aliases.keySet(), ", "));
       return aliases.keySet().iterator().next();
-
+        
     }
-
   }
 
 }