Fix merge issues

2013-05-05 23:35:51 -10:00
parent df62697477
commit 9d19ed9463
2 changed files with 13 additions and 8 deletions
--- a/src/Umbraco.Core/Persistence/DefaultDatabaseFactory.cs
+++ b/src/Umbraco.Core/Persistence/DefaultDatabaseFactory.cs
@@ -92,7 +92,7 @@ namespace Umbraco.Core.Persistence
 		{
 			if (HttpContext.Current == null)
 			{
-				_globalInstance.Dispose();
+                _nonHttpInstance.Dispose();
 			}
 			else
 			{