h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 13:22:55 +08:00
Code Issues Releases Wiki Activity

Guard against disposal in all context retrievals

Browse Source
This commit is contained in:
Dean Herbert 2021-10-01 03:46:53 +09:00
parent 8557530cd5
commit b51fd00ba3
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
osu.Game/Database/RealmContextFactory.cs
View File

@ -51,7 +51,7 @@ namespace osu.Game.Database
{ {
if (context == null) if (context == null)
{ {
context = createContext(); context = CreateContext();
Logger.Log($"Opened realm \"{context.Config.DatabasePath}\" at version {context.Config.SchemaVersion}"); Logger.Log($"Opened realm \"{context.Config.DatabasePath}\" at version {context.Config.SchemaVersion}");
} }
@ -73,14 +73,6 @@ namespace osu.Game.Database
Filename += realm_extension; Filename += realm_extension;
} }
public Realm CreateContext()
{
if (IsDisposed)
throw new ObjectDisposedException(nameof(RealmContextFactory));
return createContext();
}
/// <summary> /// <summary>
/// Compact this realm. /// Compact this realm.
/// </summary> /// </summary>
@ -98,8 +90,11 @@ namespace osu.Game.Database
} }
} }
private Realm createContext() public Realm CreateContext()
{ {
if (IsDisposed)
throw new ObjectDisposedException(nameof(RealmContextFactory));
try try
{ {
contextCreationLock.Wait(); contextCreationLock.Wait();
@ -161,7 +156,10 @@ namespace osu.Game.Database
protected override void Dispose(bool isDisposing) protected override void Dispose(bool isDisposing)
{ {
context?.Dispose(); lock (contextLock)
{
context?.Dispose();
}
if (!IsDisposed) if (!IsDisposed)
{ {