From a3abd65e3de850a4516b91a017b1049ce4abe4fe Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 20 Mar 2012 01:41:32 +0000
Subject: Remove pointless ThreadAbortException catching in a test that isn't
 run anyway.

---
 .../Framework/Scenes/Tests/ScenePresenceTeleportTests.cs | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs
index c5a76b2..bebc10c 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs
@@ -63,17 +63,11 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 
             Thread testThread = new Thread(testClass.run);
 
-            try
-            {
-                // Seems kind of redundant to start a thread and then join it, however..   We need to protect against
-                // A thread abort exception in the simulator code.
-                testThread.Start();
-                testThread.Join();
-            } 
-            catch (ThreadAbortException)
-            {
-                
-            }
+            // Seems kind of redundant to start a thread and then join it, however..   We need to protect against
+            // A thread abort exception in the simulator code.
+            testThread.Start();
+            testThread.Join();
+
             Assert.That(testClass.results.Result, Is.EqualTo(true), testClass.results.Message);
             // Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod());
         }
-- 
cgit v1.1