From 78ff82bfe9728b83a56e315522ee33961abe9a9d Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 12 Aug 2011 23:40:22 +0100
Subject: If a map request to a server fails, always close the outbound
 connection.

This probably doesn't help with the current memory leak.
---
 OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index fac2dab..7b00597 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -682,7 +682,6 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                 mapitemsrequest.ContentLength = buffer.Length;   //Count bytes to send
                 os = mapitemsrequest.GetRequestStream();
                 os.Write(buffer, 0, buffer.Length);         //Send it
-                os.Close();
                 //m_log.DebugFormat("[WORLD MAP]: Getting MapItems from {0}", httpserver);
             }
             catch (WebException ex)
@@ -705,6 +704,11 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                 responseMap["connect"] = OSD.FromBoolean(false);
                 return responseMap;
             }
+            finally
+            {
+                if (os != null)
+                    os.Close();                    
+            }
 
             string response_mapItems_reply = null;
             { // get the response
-- 
cgit v1.1