Fix null reference issue in Database Manager

microsoft · Oct 7, 2019 · a6782cc · a6782cc
2 parents 4215dcc + 2ddc801
commit a6782cc
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/Lib/Utils/DatabaseManager.cs b/Lib/Utils/DatabaseManager.cs
@@ -352,14 +352,12 @@ public static void Commit()
                 if (_transaction != null)
                 {
                     _transaction.Commit();
-                    _transaction = null;
                 }
             }
             catch (Exception)
             {
-                Log.Debug("Commit collision");
+                Log.Information("Failed to commit data to database.");
             }
-
             _transaction = null;
         }
 
@@ -399,7 +397,14 @@ public static string SqliteFilename
         public static void CloseDatabase()
         {
             Commit();
-            Connection.Close();
+            try
+            {
+                Connection.Close();
+            }
+            catch (NullReferenceException)
+            {
+                // That's fine. We want Connection to be null.
+            }
             Connection = null;
         }
 
@@ -428,6 +433,10 @@ public static void WriteNext()
             {
                 Log.Debug($"Error writing {objIn.ColObj.Identity} to database.");
             }
+            catch (NullReferenceException)
+            {
+                Log.Debug($"Was this a valid WriteObject. It looked null. {JsonConvert.SerializeObject(objIn)}");
+            }
         }
 
         public static List<RawCollectResult> GetMissingFromFirst(string firstRunId, string secondRunId)