correctly report no aliases

wildfly-security · Apr 24, 2017 · 050fad3 · 050fad3
1 parent bfc98cc
commit 050fad3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/src/main/java/org/wildfly/security/tool/CredentialStoreCommand.java b/src/main/java/org/wildfly/security/tool/CredentialStoreCommand.java
@@ -206,11 +206,15 @@ public void execute(String[] args) throws Exception {
             }
         } else if (cmdLine.hasOption(ALIASES_PARAM)) {
             Set<String> aliases = credentialStore.getAliases();
-            StringBuilder list = new StringBuilder();
-            for (String alias: aliases) {
-                list.append(alias).append(" ");
+            if (aliases.size() != 0) {
+                StringBuilder list = new StringBuilder();
+                for (String alias: aliases) {
+                    list.append(alias).append(" ");
+                }
+                System.out.println(ElytronToolMessages.msg.aliases(list.toString()));
+            } else {
+                System.out.println(ElytronToolMessages.msg.noAliases());
             }
-            System.out.println(ElytronToolMessages.msg.aliases(list.toString()));
             setStatus(ElytronTool.ElytronToolExitStatus_OK);
         } else {
             setStatus(ACTION_NOT_DEFINED);

diff --git a/src/main/java/org/wildfly/security/tool/ElytronToolMessages.java b/src/main/java/org/wildfly/security/tool/ElytronToolMessages.java
@@ -131,6 +131,9 @@ public interface ElytronToolMessages extends BasicLogger {
     @Message(id = NONE, value = "Credential store contains following aliases: %s")
     String aliases(String aliases);
 
+    @Message(id = NONE, value = "Credential store contains no aliases")
+    String noAliases();
+
     @Message(id = NONE, value = "Action to perform on the credential store is not defined")
     Exception actionToPerformNotDefined();