aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2015-01-21 20:46:29 +0000
committerJustin Clark-Casey (justincc)2015-01-21 20:46:29 +0000
commited8d0fbea435eaf7ff4c58a5b8d568d84c2516e9 (patch)
tree36bb1848ed6278653931821388b045d3dfe7afcd
parentAdd debug ability to ignore reliably sent packets that are not acknowledged. (diff)
downloadopensim-SC-ed8d0fbea435eaf7ff4c58a5b8d568d84c2516e9.zip
opensim-SC-ed8d0fbea435eaf7ff4c58a5b8d568d84c2516e9.tar.gz
opensim-SC-ed8d0fbea435eaf7ff4c58a5b8d568d84c2516e9.tar.bz2
opensim-SC-ed8d0fbea435eaf7ff4c58a5b8d568d84c2516e9.tar.xz
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
-rw-r--r--OpenSim/Services/Connectors/Hypergrid/HeloServicesConnector.cs10
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Services/Connectors/Hypergrid/HeloServicesConnector.cs b/OpenSim/Services/Connectors/Hypergrid/HeloServicesConnector.cs
index c0041e6..b5e6d69 100644
--- a/OpenSim/Services/Connectors/Hypergrid/HeloServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Hypergrid/HeloServicesConnector.cs
@@ -84,16 +84,16 @@ namespace OpenSim.Services.Connectors
84 { 84 {
85 if (String.IsNullOrEmpty(m_ServerURI)) 85 if (String.IsNullOrEmpty(m_ServerURI))
86 { 86 {
87 m_log.WarnFormat("[HELO SERVICE]: Unable to invoke HELO due to malformed URL"); 87 m_log.WarnFormat("[HELO SERVICE]: Unable to invoke HELO due to empty URL");
88 return String.Empty; 88 return String.Empty;
89 } 89 }
90 90
91 HttpWebRequest req = (HttpWebRequest)HttpWebRequest.Create(m_ServerURI);
92 // Eventually we need to switch to HEAD
93 /* req.Method = "HEAD"; */
94
95 try 91 try
96 { 92 {
93 HttpWebRequest req = (HttpWebRequest)HttpWebRequest.Create(m_ServerURI);
94 // Eventually we need to switch to HEAD
95 /* req.Method = "HEAD"; */
96
97 using (WebResponse response = req.GetResponse()) 97 using (WebResponse response = req.GetResponse())
98 { 98 {
99 if (response.Headers.Get("X-Handlers-Provided") == null) // just in case this ever returns a null 99 if (response.Headers.Get("X-Handlers-Provided") == null) // just in case this ever returns a null