From ab6d1bd5a63693cc1cd8996c912238572e738356 Mon Sep 17 00:00:00 2001
From: gareth <gareth>
Date: Thu, 17 May 2007 01:11:36 +0000
Subject: [PATCH] Added some exception handling

---
 .../GridServerConnectionManager.cs            | 27 +++++++++++--------
 .../OpenGridServices.Manager/Main.cs          |  6 ++++-
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/OpenGridServices.Manager/OpenGridServices.Manager/GridServerConnectionManager.cs b/OpenGridServices.Manager/OpenGridServices.Manager/GridServerConnectionManager.cs
index 112487f37f..8c933e1f53 100644
--- a/OpenGridServices.Manager/OpenGridServices.Manager/GridServerConnectionManager.cs
+++ b/OpenGridServices.Manager/OpenGridServices.Manager/GridServerConnectionManager.cs
@@ -11,18 +11,23 @@ namespace OpenGridServices.Manager
 		
 		public bool Connect(string GridServerURL, string username, string password)
 		{
-			this.ServerURL=GridServerURL;
-			Hashtable LoginParamsHT = new Hashtable();
-			LoginParamsHT["username"]=username;
-			LoginParamsHT["password"]=password;
-			ArrayList LoginParams = new ArrayList();
-			LoginParams.Add(LoginParamsHT);
-			XmlRpcRequest GridLoginReq = new XmlRpcRequest("manager_login",LoginParams);
-			XmlRpcResponse GridResp = GridLoginReq.Send(ServerURL,3000);
-			if(GridResp.IsFault) {
+			try {
+				this.ServerURL=GridServerURL;
+				Hashtable LoginParamsHT = new Hashtable();
+				LoginParamsHT["username"]=username;
+				LoginParamsHT["password"]=password;
+				ArrayList LoginParams = new ArrayList();
+				LoginParams.Add(LoginParamsHT);
+				XmlRpcRequest GridLoginReq = new XmlRpcRequest("manager_login",LoginParams);
+				XmlRpcResponse GridResp = GridLoginReq.Send(ServerURL,3000);
+				if(GridResp.IsFault) {
+					return false;
+				} else {
+					return true;
+				}
+			} catch(Exception e) {
+				Console.WriteLine(e.ToString());
 				return false;
-			} else {
-				return true;
 			}
 		}
 	}
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager/Main.cs b/OpenGridServices.Manager/OpenGridServices.Manager/Main.cs
index b14d10b1ff..0e3f74d6c8 100644
--- a/OpenGridServices.Manager/OpenGridServices.Manager/Main.cs
+++ b/OpenGridServices.Manager/OpenGridServices.Manager/Main.cs
@@ -39,7 +39,11 @@ namespace OpenGridServices.Manager
 				switch(cmd) {
 					case "connect_to_gridserver":
 						win.SetStatus("Connecting to grid server...");						
-						gridserverConn.Connect(operation.Split(sep)[1],operation.Split(sep)[2],operation.Split(sep)[3]);
+						if(gridserverConn.Connect(operation.Split(sep)[1],operation.Split(sep)[2],operation.Split(sep)[3])) {
+							win.SetStatus("Connected OK");
+						} else {
+							win.SetStatus("Could not connect");
+						}
 					break;
 				}
 			}