[java-identity-provider] 03/03: IDP-1595 Plugin Handling improvements

Rod Widdowson rdw at steadingsoftware.com
Wed Sep 30 12:00:11 UTC 2020


This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch main
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=b746fa512e1576d56af7f7661d93b31c787fe53d

commit b746fa512e1576d56af7f7661d93b31c787fe53d
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Sep 30 12:59:31 2020 +0100

    IDP-1595 Plugin Handling improvements
    
    https://issues.shibboleth.net/jira/browse/IDP-1595
    
    Only ask onces when there is a default answer.
---
 .../idp/installer/plugin/impl/PluginInstallerCLI.java         | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstallerCLI.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstallerCLI.java
index d11feca42..4d4e16223 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstallerCLI.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstallerCLI.java
@@ -361,13 +361,10 @@ public final class PluginInstallerCLI extends AbstractIdPHomeAwareCommandLine<Pl
 
         /** {@inheritDoc} */
         public boolean test(final String certString) {
-            String result = null;
-            while (result == null) {
-                System.console().printf("%s:\n%s [yN] ", promptText, certString);
-                System.console().flush();
-                result  = StringSupport.trimOrNull(System.console().readLine());
-            }
-            return "y".equalsIgnoreCase(result.substring(0, 1));
+            System.console().printf("%s:\n%s [yN] ", promptText, certString);
+            System.console().flush();
+            final String result  = StringSupport.trimOrNull(System.console().readLine());
+            return result != null && "y".equalsIgnoreCase(result.substring(0, 1));
         }
     }
 }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the commits mailing list