1 files changed, 5 insertions, 4 deletions

diff --git a/OpenSim/Framework/Servers/MainServer.cs b/OpenSim/Framework/Servers/MainServer.cs
index 523ccba..6a9be12 100644
--- a/OpenSim/Framework/Servers/MainServer.cs
+++ b/OpenSim/Framework/Servers/MainServer.cs
@@ -87,14 +87,15 @@ namespace OpenSim.Framework.Servers
             set
             {
                 lock (m_Servers)
+                {
                     if (!m_Servers.ContainsValue(value))
                         throw new Exception("HTTP server must already have been registered to be set as the main instance");
 
-                instance = value;
+                    instance = value;
+                }
             }
         }
 
-        
         public static BaseHttpServer UnSecureInstance
         {
             get { return unsecureinstance; }
@@ -372,14 +373,14 @@ namespace OpenSim.Framework.Servers
 
         public static void Stop()
         {
+            PollServiceRequestManager pool = null;
             lock (m_Servers)
             {
                 foreach (BaseHttpServer httpServer in m_Servers.Values)
                 {
-                    httpServer.Stop();
+                    httpServer.Stop(true);
                 }
             }
         }
-
     }
 }
\ No newline at end of file