From ed8d0fbea435eaf7ff4c58a5b8d568d84c2516e9 Mon Sep 17 00:00:00 2001 From: "Justin Clark-Casey (justincc)" Date: Wed, 21 Jan 2015 20:46:29 +0000 Subject: [PATCH] Don't allow a failure in create a request in HeloService.Connector.Helo() to propogate up the stack. Relates to http://opensimulator.org/mantis/view.php?id=7421 --- .../Connectors/Hypergrid/HeloServicesConnector.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/OpenSim/Services/Connectors/Hypergrid/HeloServicesConnector.cs b/OpenSim/Services/Connectors/Hypergrid/HeloServicesConnector.cs index c0041e6673..b5e6d69405 100644 --- a/OpenSim/Services/Connectors/Hypergrid/HeloServicesConnector.cs +++ b/OpenSim/Services/Connectors/Hypergrid/HeloServicesConnector.cs @@ -84,16 +84,16 @@ namespace OpenSim.Services.Connectors { if (String.IsNullOrEmpty(m_ServerURI)) { - m_log.WarnFormat("[HELO SERVICE]: Unable to invoke HELO due to malformed URL"); + m_log.WarnFormat("[HELO SERVICE]: Unable to invoke HELO due to empty URL"); return String.Empty; } - HttpWebRequest req = (HttpWebRequest)HttpWebRequest.Create(m_ServerURI); - // Eventually we need to switch to HEAD - /* req.Method = "HEAD"; */ - try { + HttpWebRequest req = (HttpWebRequest)HttpWebRequest.Create(m_ServerURI); + // Eventually we need to switch to HEAD + /* req.Method = "HEAD"; */ + using (WebResponse response = req.GetResponse()) { if (response.Headers.Get("X-Handlers-Provided") == null) // just in case this ever returns a null