[java-identity-provider COMMIT] in /trunk/idp-core/src/main/java/net/shibboleth/idp/cli: CLI.java StatusArguments.java

[noreply at shibboleth.net]

Author: scantor
Date: Tue Sep 30 21:21:12 2014
New Revision: 6609

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6609&view=rev
Log:
Change CLI error output, and add a driver for status handler.

Added:
    trunk/idp-core/src/main/java/net/shibboleth/idp/cli/StatusArguments.java   (with props)
Modified:
    trunk/idp-core/src/main/java/net/shibboleth/idp/cli/CLI.java

Modified: trunk/idp-core/src/main/java/net/shibboleth/idp/cli/CLI.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-core/src/main/java/net/shibboleth/idp/cli/CLI.java?rev=6609&r1=6608&r2=6609&view=diff
==============================================================================
--- trunk/idp-core/src/main/java/net/shibboleth/idp/cli/CLI.java (original)
+++ trunk/idp-core/src/main/java/net/shibboleth/idp/cli/CLI.java Tue Sep 30 21:21:12 2014
@@ -91,8 +91,9 @@
      * @param args  the populated command line arguments
      */
     private static void doRequest(@Nonnull final CommandLineArguments args) {
+        URL url = null;
         try {
-            final URL url = args.buildURL();
+            url = args.buildURL();
             try (final InputStream stream = url.openStream()) {
                 try (final InputStreamReader reader = new InputStreamReader(stream)) {
                     try (final BufferedReader in = new BufferedReader(reader)) {
@@ -106,7 +107,7 @@
         } catch (final MalformedURLException e) {
             errorAndExit(e.getMessage());
         } catch (final IOException e) {
-            errorAndExit(e.getMessage());
+            errorAndExit((url != null ? "(" + url.toString() + ") " : "") + e.getMessage());
         }
     }