diff options
| author | Tom Grimshaw | 2010-05-29 01:03:59 -0700 |
|---|---|---|
| committer | Tom Grimshaw | 2010-05-29 01:03:59 -0700 |
| commit | 2f409116db570be77fc75df188a4044250dce226 (patch) | |
| tree | 424980e50591e1d4b7d89fe88960e457b19c457d /OpenSim/Services/Connectors/Land | |
| parent | Merge branch 'careminster-presence-refactor' of www.3dhosting.de:/var/git/car... (diff) | |
| download | opensim-SC_OLD-2f409116db570be77fc75df188a4044250dce226.zip opensim-SC_OLD-2f409116db570be77fc75df188a4044250dce226.tar.gz opensim-SC_OLD-2f409116db570be77fc75df188a4044250dce226.tar.bz2 opensim-SC_OLD-2f409116db570be77fc75df188a4044250dce226.tar.xz | |
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.
Diffstat (limited to 'OpenSim/Services/Connectors/Land')
| -rw-r--r-- | OpenSim/Services/Connectors/Land/LandServiceConnector.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Services/Connectors/Land/LandServiceConnector.cs b/OpenSim/Services/Connectors/Land/LandServiceConnector.cs index 06bc11c..0223a77 100644 --- a/OpenSim/Services/Connectors/Land/LandServiceConnector.cs +++ b/OpenSim/Services/Connectors/Land/LandServiceConnector.cs | |||
| @@ -83,6 +83,8 @@ namespace OpenSim.Services.Connectors | |||
| 83 | if (info != null) // just to be sure | 83 | if (info != null) // just to be sure |
| 84 | { | 84 | { |
| 85 | XmlRpcRequest request = new XmlRpcRequest("land_data", paramList); | 85 | XmlRpcRequest request = new XmlRpcRequest("land_data", paramList); |
| 86 | |||
| 87 | //Possible nullref from info.externalendpoint will be caught here | ||
| 86 | string uri = "http://" + info.ExternalEndPoint.Address + ":" + info.HttpPort + "/"; | 88 | string uri = "http://" + info.ExternalEndPoint.Address + ":" + info.HttpPort + "/"; |
| 87 | XmlRpcResponse response = request.Send(uri, 10000); | 89 | XmlRpcResponse response = request.Send(uri, 10000); |
| 88 | if (response.IsFault) | 90 | if (response.IsFault) |