[java-identity-provider] branch main updated: Fix some glitchy error/log messages.

[Scott Cantor]

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

scantor 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=95b22225bd0e980b1bbe669d46a7bc84fb128aa8

The following commit(s) were added to refs/heads/main by this push:
     new 95b22225b Fix some glitchy error/log messages.
95b22225b is described below

commit 95b22225bd0e980b1bbe669d46a7bc84fb128aa8
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Mar 29 20:27:42 2022 -0400

    Fix some glitchy error/log messages.
---
 .../idp/installer/plugin/impl/PluginInstallerCLI.java      | 14 +++++++-------
 1 file changed, 7 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 2560696a9..67cd4e61e 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
@@ -398,7 +398,7 @@ public final class PluginInstallerCLI extends AbstractIdPHomeAwareCommandLine<Pl
                             e.getKey(),
                             existingVersion));
                 } else {
-                    outOrLog(String.format("Plugin %s: Installed version %s: Update to &s available",
+                    outOrLog(String.format("Plugin %s: Installed version %s: Update to %s available",
                             e.getKey(),
                             existingVersion,
                             version));
@@ -415,10 +415,10 @@ public final class PluginInstallerCLI extends AbstractIdPHomeAwareCommandLine<Pl
         final List<URL> urls;
         final Properties props = new Properties();
         try {
-            if ((updateURLs == null) || (updateURLs.isEmpty())) {
-                    urls = List.of(
-                            new URL("https://shibboleth.net/downloads/identity-provider/plugins/plugins.properties"),
-                            new URL("http://plugins.shibboleth.net/plugins.properties"));
+            if (updateURLs == null || updateURLs.isEmpty()) {
+                urls = List.of(
+                        new URL("https://shibboleth.net/downloads/identity-provider/plugins/plugins.properties"),
+                        new URL("http://plugins.shibboleth.net/plugins.properties"));
             } else {
                 urls = updateURLs;
             }
@@ -458,13 +458,13 @@ public final class PluginInstallerCLI extends AbstractIdPHomeAwareCommandLine<Pl
     private int autoPluginFromId(final String pluginId, final boolean checkVersion) {
         final IdPPlugin existing = installer.getInstalledPlugin(pluginId);
         if (existing != null) {
-            log.error("Plugin {} is already installed");
+            log.error("Plugin {} is already installed", pluginId);
             return RC_INIT;
         }
         final Properties props = loadPluginInfo();
         final PluginInfo info = new PluginInfo(pluginId, props);
         if (!info.isInfoComplete()) {
-            log.error("Plugin {}: Information not found");
+            log.error("Plugin {}: Information not found", pluginId);
             return RC_INIT;
         }
         final PluginVersion versionToInstall = getBestVersion(new PluginVersion(0,0,0), info);

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