Updated Branches: refs/heads/master 2c39018fd -> 11fadffdd
CLI Login validation Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/0306ee82 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/0306ee82 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/0306ee82 Branch: refs/heads/master Commit: 0306ee82a9f2ef1f63756a1fe0229af8774c81bf Parents: 769e0af Author: Manula Thantriwatte <[email protected]> Authored: Thu Dec 12 13:09:28 2013 +0530 Committer: Manula Thantriwatte <[email protected]> Committed: Thu Dec 12 13:09:28 2013 +0530 ---------------------------------------------------------------------- .../src/main/java/org/apache/stratos/cli/RestClient.java | 7 ++++++- .../java/org/apache/stratos/cli/RestCommandLineService.java | 5 +++++ 2 files changed, 11 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/0306ee82/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestClient.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestClient.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestClient.java index 463743f..266591d 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestClient.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestClient.java @@ -21,6 +21,8 @@ package org.apache.stratos.cli; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; +import java.net.ConnectException; + import org.apache.http.HttpResponse; import org.apache.http.client.ClientProtocolException; import org.apache.http.client.methods.HttpGet; @@ -99,7 +101,10 @@ public class RestClient implements GenericRestClient{ } catch (ClientProtocolException e) { throw new ClientProtocolException(); - } catch (IOException e) { + } catch (ConnectException e) { + throw new ConnectException(); + } + catch (IOException e) { e.printStackTrace(); return null; } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/0306ee82/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java index b32054a..7bacd91 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java @@ -31,6 +31,8 @@ import org.apache.stratos.cli.exception.CommandException; import org.apache.stratos.cli.utils.CliConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + +import java.net.ConnectException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -121,6 +123,9 @@ public class RestCommandLineService { } catch (ClientProtocolException e) { System.out.println("Authentication failed!"); return false; + } catch (ConnectException e) { + System.out.println("Authentication failed. Please set the STRTOS_URL"); + return false; } }
