From 09ea82b37f5f6da55989cf7848d49f29d99edbda Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 18 Mar 2014 11:57:53 +1100
Subject: [PATCH] fixes last unit tests

---
 .../TestHelpers/BaseUmbracoApplicationTest.cs   | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/Umbraco.Tests/TestHelpers/BaseUmbracoApplicationTest.cs b/src/Umbraco.Tests/TestHelpers/BaseUmbracoApplicationTest.cs
index 74c27562d8..f22eb171b8 100644
--- a/src/Umbraco.Tests/TestHelpers/BaseUmbracoApplicationTest.cs
+++ b/src/Umbraco.Tests/TestHelpers/BaseUmbracoApplicationTest.cs
@@ -69,23 +69,18 @@ namespace Umbraco.Tests.TestHelpers
             
         }
         
-        private static readonly object Locker = new object();
-        private static volatile bool _legacyMappingInit = false;
+        private static readonly object Locker = new object();        
 
         private static void InitializeLegacyMappingsForCoreEditors()
         {
-            if (_legacyMappingInit == false)
+            lock (Locker)
             {
-                lock (Locker)
+                if (LegacyPropertyEditorIdToAliasConverter.Count() == 0)
                 {
-                    if (_legacyMappingInit == false)
-                    {
-                        _legacyMappingInit = true;
-                        //Create the legacy prop-eds mapping
-                        LegacyPropertyEditorIdToAliasConverter.CreateMappingsForCoreEditors();
-                    }
+                    //Create the legacy prop-eds mapping
+                    LegacyPropertyEditorIdToAliasConverter.CreateMappingsForCoreEditors();
                 }
-            }
+            }         
         }
         
         /// <summary>