From bad0d15c1c780ee50890613862dabd40c9691be7 Mon Sep 17 00:00:00 2001 From: Stephan Date: Fri, 18 Nov 2016 13:32:56 +0100 Subject: [PATCH] U4-9201 - troubleshoot --- src/Umbraco.Core/Persistence/UmbracoDatabase.cs | 1 + src/Umbraco.Core/UmbracoApplicationBase.cs | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Core/Persistence/UmbracoDatabase.cs b/src/Umbraco.Core/Persistence/UmbracoDatabase.cs index 62cbfa78c4..4c7ba0b4c6 100644 --- a/src/Umbraco.Core/Persistence/UmbracoDatabase.cs +++ b/src/Umbraco.Core/Persistence/UmbracoDatabase.cs @@ -247,6 +247,7 @@ namespace Umbraco.Core.Persistence protected override void Dispose(bool disposing) { + base.Dispose(disposing); LogHelper.Debug("Dispose (" + InstanceSid + ")."); if (DatabaseFactory != null) DatabaseFactory.OnDispose(this); } diff --git a/src/Umbraco.Core/UmbracoApplicationBase.cs b/src/Umbraco.Core/UmbracoApplicationBase.cs index c6cdfb072a..1bf90fb154 100644 --- a/src/Umbraco.Core/UmbracoApplicationBase.cs +++ b/src/Umbraco.Core/UmbracoApplicationBase.cs @@ -63,7 +63,9 @@ namespace Umbraco.Core // after Umbraco has started there is a database in "context" and that context is // going to stay there and never get destroyed nor reused, so we have to ensure that // the database is disposed (which will auto-remove it from context). - ApplicationContext.Current.DatabaseContext.Database.Dispose(); + var database = ApplicationContext.Current.DatabaseContext.Database; + if (database != null) // never to happen... unless in weird tests + ApplicationContext.Current.DatabaseContext.Database.Dispose(); } ///