From 0abb400f6400e8ceca40bbf34950aa1671a06eb4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 30 Jun 2022 15:14:25 +0900
Subject: [PATCH 1/3] Add reproduction of transaction not being exited
 correctly

---
 osu.Game.Tests/Database/RealmLiveTests.cs | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/osu.Game.Tests/Database/RealmLiveTests.cs b/osu.Game.Tests/Database/RealmLiveTests.cs
index 00a667521d..fd1f564f59 100644
--- a/osu.Game.Tests/Database/RealmLiveTests.cs
+++ b/osu.Game.Tests/Database/RealmLiveTests.cs
@@ -91,6 +91,25 @@ namespace osu.Game.Tests.Database
             Assert.IsFalse(liveBeatmap.PerformRead(l => l.Hidden));
         }
 
+        [Test]
+        public void TestTransactionRolledBackOnException()
+        {
+            RunTestWithRealm((realm, _) =>
+            {
+                var beatmap = new BeatmapInfo(CreateRuleset(), new BeatmapDifficulty(), new BeatmapMetadata());
+
+                realm.Run(r => r.Write(_ => r.Add(beatmap)));
+
+                var liveBeatmap = beatmap.ToLive(realm);
+
+                Assert.Throws<InvalidOperationException>(() => liveBeatmap.PerformWrite(l => throw new InvalidOperationException()));
+                Assert.IsFalse(liveBeatmap.PerformRead(l => l.Hidden));
+
+                liveBeatmap.PerformWrite(l => l.Hidden = true);
+                Assert.IsTrue(liveBeatmap.PerformRead(l => l.Hidden));
+            });
+        }
+
         [Test]
         public void TestScopedReadWithoutContext()
         {

From 78d86fd3ffef5f61b06ea557ab777a0990174762 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 30 Jun 2022 15:11:22 +0900
Subject: [PATCH 2/3] Fix `PerformWrite` not rolling back transaction on
 exception

---
 osu.Game/Database/RealmLive.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Database/RealmLive.cs b/osu.Game/Database/RealmLive.cs
index 72de747807..9c871a3929 100644
--- a/osu.Game/Database/RealmLive.cs
+++ b/osu.Game/Database/RealmLive.cs
@@ -104,9 +104,12 @@ namespace osu.Game.Database
 
             PerformRead(t =>
             {
-                var transaction = t.Realm.BeginWrite();
-                perform(t);
-                transaction.Commit();
+                using (var transaction = t.Realm.BeginWrite())
+                {
+                    perform(t);
+                    transaction.Commit();
+                }
+
                 RealmLiveStatistics.WRITES.Value++;
             });
         }

From 356c0501ec25596ed62dc0c8ae0c4af3cf56878f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 30 Jun 2022 15:40:44 +0900
Subject: [PATCH 3/3] Guard again potential nulls in `RealmNamedFileUsage`

Hopefully help in figuring out https://sentry.ppy.sh/organizations/ppy/issues/3679/?project=2&query=user%3A%22id%3A10078484%22
---
 osu.Game/Models/RealmNamedFileUsage.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Models/RealmNamedFileUsage.cs b/osu.Game/Models/RealmNamedFileUsage.cs
index 0f6f439d73..c4310c4edb 100644
--- a/osu.Game/Models/RealmNamedFileUsage.cs
+++ b/osu.Game/Models/RealmNamedFileUsage.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using JetBrains.Annotations;
 using osu.Framework.Testing;
 using osu.Game.Database;
@@ -19,8 +20,8 @@ namespace osu.Game.Models
 
         public RealmNamedFileUsage(RealmFile file, string filename)
         {
-            File = file;
-            Filename = filename;
+            File = file ?? throw new ArgumentNullException(nameof(file));
+            Filename = filename ?? throw new ArgumentNullException(nameof(filename));
         }
 
         [UsedImplicitly]