From 2f409116db570be77fc75df188a4044250dce226 Mon Sep 17 00:00:00 2001
From: Tom Grimshaw
Date: Sat, 29 May 2010 01:03:59 -0700
Subject: Stop IGridService from throwing a fatal exception when an IPEndPoint
 cannot be resolved, and add some handlers to deal with this cleanly; a
 condition was observed on OSGrid where a neighbouring region with an invalid
 (unresolveable) hostname would prevent a region from starting. This is bad.

---
 .../Connectors/Hypergrid/GatekeeperServiceConnector.cs     | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs')

diff --git a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
index c426bba..6f159a0 100644
--- a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
@@ -87,7 +87,12 @@ namespace OpenSim.Services.Connectors.Hypergrid
             paramList.Add(hash);
 
             XmlRpcRequest request = new XmlRpcRequest("link_region", paramList);
-            string uri = "http://" + info.ExternalEndPoint.Address + ":" + info.HttpPort + "/";
+            IPEndPoint ext = info.ExternalEndPoint;
+            string uri = "";
+            if (ext != null)
+            {
+                uri = "http://" + ext.Address + ":" + info.HttpPort + "/";
+            }
             //m_log.Debug("[GATEKEEPER SERVICE CONNECTOR]: Linking to " + uri);
             XmlRpcResponse response = null;
             try
@@ -189,7 +194,12 @@ namespace OpenSim.Services.Connectors.Hypergrid
             paramList.Add(hash);
 
             XmlRpcRequest request = new XmlRpcRequest("get_region", paramList);
-            string uri = "http://" + gatekeeper.ExternalEndPoint.Address + ":" + gatekeeper.HttpPort + "/";
+            IPEndPoint ext = gatekeeper.ExternalEndPoint;
+            string uri = "";
+            if (ext != null)
+            {
+                uri = "http://" + ext.Address + ":" + gatekeeper.HttpPort + "/";
+            }
             m_log.Debug("[GATEKEEPER SERVICE CONNECTOR]: contacting " + uri);
             XmlRpcResponse response = null;
             try
-- 
cgit v1.1