aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorjustincc2009-12-14 16:29:25 +0000
committerjustincc2009-12-14 16:29:25 +0000
commitbe3360db67afd1778a74a428323cc76028b21eed (patch)
tree17b2b92a450d0357f74815e0756da884b0a005d4
parentFix to make [bad] tests happy. (diff)
downloadopensim-SC-be3360db67afd1778a74a428323cc76028b21eed.zip
opensim-SC-be3360db67afd1778a74a428323cc76028b21eed.tar.gz
opensim-SC-be3360db67afd1778a74a428323cc76028b21eed.tar.bz2
opensim-SC-be3360db67afd1778a74a428323cc76028b21eed.tar.xz
replace a couple of xmlrpc invocations with invoke() instead of send()
this is in order to force an exception on an error - send() does not do this and people end up simply ignoring the error codes...
-rw-r--r--OpenSim/Grid/MessagingServer.Modules/InterMessageUserServerModule.cs5
-rw-r--r--OpenSim/Grid/MessagingServer.Modules/MessageService.cs3
2 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Grid/MessagingServer.Modules/InterMessageUserServerModule.cs b/OpenSim/Grid/MessagingServer.Modules/InterMessageUserServerModule.cs
index 662dad3..d667af3 100644
--- a/OpenSim/Grid/MessagingServer.Modules/InterMessageUserServerModule.cs
+++ b/OpenSim/Grid/MessagingServer.Modules/InterMessageUserServerModule.cs
@@ -113,8 +113,9 @@ namespace OpenSim.Grid.MessagingServer.Modules
113 // Send Request 113 // Send Request
114 try 114 try
115 { 115 {
116 XmlRpcRequest UserReq = new XmlRpcRequest("register_messageserver", SendParams); 116 XmlRpcRequest UserReq = new XmlRpcRequest("register_messageserver", SendParams);
117 XmlRpcResponse UserResp = UserReq.Send(srv, 16000); 117 XmlRpcResponse UserResp = (XmlRpcResponse)UserReq.Invoke(srv);
118 //XmlRpcResponse UserResp = UserReq.Send(srv, 16000);
118 119
119 // Process Response 120 // Process Response
120 Hashtable GridRespData = (Hashtable)UserResp.Value; 121 Hashtable GridRespData = (Hashtable)UserResp.Value;
diff --git a/OpenSim/Grid/MessagingServer.Modules/MessageService.cs b/OpenSim/Grid/MessagingServer.Modules/MessageService.cs
index 3ab93a3..ec7791b 100644
--- a/OpenSim/Grid/MessagingServer.Modules/MessageService.cs
+++ b/OpenSim/Grid/MessagingServer.Modules/MessageService.cs
@@ -270,7 +270,8 @@ namespace OpenSim.Grid.MessagingServer.Modules
270 IList parameters = new ArrayList(); 270 IList parameters = new ArrayList();
271 parameters.Add(param); 271 parameters.Add(param);
272 XmlRpcRequest req = new XmlRpcRequest("get_user_friend_list", parameters); 272 XmlRpcRequest req = new XmlRpcRequest("get_user_friend_list", parameters);
273 XmlRpcResponse resp = req.Send(m_cfg.UserServerURL, 3000); 273 XmlRpcResponse resp = (XmlRpcResponse)req.Invoke(m_cfg.UserServerURL);
274 //XmlRpcResponse resp = req.Send(m_cfg.UserServerURL, 3000);
274 Hashtable respData = (Hashtable)resp.Value; 275 Hashtable respData = (Hashtable)resp.Value;
275 276
276 if (respData.Contains("avcount")) 277 if (respData.Contains("avcount"))