aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs11
-rw-r--r--OpenSim/Framework/Communications/Tests/LoginServiceTests.cs10
-rw-r--r--OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs19
3 files changed, 34 insertions, 6 deletions
diff --git a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs b/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
index 933fa12..2bb0926 100644
--- a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
+++ b/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
@@ -330,5 +330,16 @@ namespace OpenSim.Framework.Communications.Tests
330 Assert.That(rootFolder.RequestListOfFolders(), Is.Empty); 330 Assert.That(rootFolder.RequestListOfFolders(), Is.Empty);
331 Assert.That(myScene.InventoryService.GetFolder(myFolder), Is.Null); 331 Assert.That(myScene.InventoryService.GetFolder(myFolder), Is.Null);
332 } 332 }
333
334 [TearDown]
335 public void TearDown()
336 {
337 try
338 {
339 if (MainServer.Instance != null) MainServer.Instance.Stop();
340 }
341 catch (System.NullReferenceException)
342 { }
343 }
333 } 344 }
334} \ No newline at end of file 345} \ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
index 57a908e..0a9d2ae 100644
--- a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
+++ b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
@@ -362,6 +362,16 @@ namespace OpenSim.Framework.Communications.Tests
362 //Console.WriteLine("Finished T023_TestAuthenticatedLoginAlreadyLoggedIn()"); 362 //Console.WriteLine("Finished T023_TestAuthenticatedLoginAlreadyLoggedIn()");
363 } 363 }
364 364
365 [TearDown]
366 public void TearDown()
367 {
368 try
369 {
370 if (MainServer.Instance != null) MainServer.Instance.Stop();
371 } catch (NullReferenceException)
372 {}
373 }
374
365 public class TestLoginToRegionConnector : ILoginServiceToRegionsConnector 375 public class TestLoginToRegionConnector : ILoginServiceToRegionsConnector
366 { 376 {
367 private List<RegionInfo> m_regionsList = new List<RegionInfo>(); 377 private List<RegionInfo> m_regionsList = new List<RegionInfo>();
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index 75c9310..771ae05 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -1637,13 +1637,20 @@ namespace OpenSim.Framework.Servers.HttpServer
1637 public void Stop() 1637 public void Stop()
1638 { 1638 {
1639 HTTPDRunning = false; 1639 HTTPDRunning = false;
1640 m_httpListener2.ExceptionThrown -= httpServerException; 1640 try
1641 //m_httpListener2.DisconnectHandler = null; 1641 {
1642 1642 m_httpListener2.ExceptionThrown -= httpServerException;
1643 m_httpListener2.LogWriter = null; 1643 //m_httpListener2.DisconnectHandler = null;
1644 m_httpListener2.RequestReceived -= OnRequest;
1645 1644
1646 m_httpListener2.Stop(); 1645 m_httpListener2.LogWriter = null;
1646 m_httpListener2.RequestReceived -= OnRequest;
1647 m_httpListener2.Stop();
1648 }
1649 catch (NullReferenceException)
1650 {
1651 m_log.Warn("[BASEHTTPSERVER]: Null Reference when stopping HttpServer.");
1652 }
1653
1647 } 1654 }
1648 1655
1649 public void RemoveStreamHandler(string httpMethod, string path) 1656 public void RemoveStreamHandler(string httpMethod, string path)