Corrected problem with defaulting to storepass when keypass is not specified.

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@290 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

diff --git a/src/edu/internet2/middleware/shibboleth/utils/ExtKeyTool.java b/src/edu/internet2/middleware/shibboleth/utils/ExtKeyTool.java
index 1727bac..daadea9 100755 (executable)
--- a/src/edu/internet2/middleware/shibboleth/utils/ExtKeyTool.java
+++ b/src/edu/internet2/middleware/shibboleth/utils/ExtKeyTool.java
@@ -790,7 +790,7 @@ public class ExtKeyTool {
                                BufferedReader reader = new BufferedReader(new InputStreamReader(System.in));
                                String passwordInput = reader.readLine();
                                passwordInput.trim();
-                               if (passwordInput != null) {
+                               if (passwordInput != null && !passwordInput.equals("")) {
                                        return passwordInput.toCharArray();
                                }
                        } catch (IOException e) {