Defensive programming around disposal of local content and media dbs.

2019-10-18 07:31:15 +01:00
parent d774ff8bc1
commit 478bc708b9
1 changed files with 10 additions and 2 deletions
--- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
@@ -145,10 +145,18 @@ namespace Umbraco.Web.PublishedCache.NuCache
                        {
                            _contentStore?.ReleaseLocalDb(); //null check because we could shut down before being assigned
                            // Make sure the local dbs are disposed of if the content store was not created.
-                            _localContentDb?.Dispose();
+                            try
+                            {
+                                _localContentDb?.Dispose();
+                            }
+                            catch { /* Carry on with cleanup */ }
                            _localContentDb = null;
                            _mediaStore?.ReleaseLocalDb(); //null check because we could shut down before being assigned
-                            _localMediaDb?.Dispose();
+                            try
+                            {
+                                _localMediaDb?.Dispose();
+                            }
+                            catch { }
                            _localMediaDb = null;
                        }