diff --git a/src/Tgstation.Server.Host/Components/Instance.cs b/src/Tgstation.Server.Host/Components/Instance.cs index f178039f9e..8f7b0e7700 100644 --- a/src/Tgstation.Server.Host/Components/Instance.cs +++ b/src/Tgstation.Server.Host/Components/Instance.cs @@ -119,6 +119,14 @@ namespace Tgstation.Server.Host.Components /// public async Task CompileProcess(Job job, IServiceProvider serviceProvider, Action progressReporter, CancellationToken cancellationToken) { + //DO NOT FOLLOW THE SUGGESTION FOR A THROW EXPRESSION HERE + if (job == null) + throw new ArgumentNullException(nameof(job)); + if (serviceProvider == null) + throw new ArgumentNullException(nameof(serviceProvider)); + if (progressReporter == null) + throw new ArgumentNullException(nameof(progressReporter)); + var databaseContext = serviceProvider.GetRequiredService(); var ddSettingsTask = databaseContext.DreamDaemonSettings.Where(x => x.InstanceId == metadata.Id).Select(x => new DreamDaemonSettings diff --git a/src/Tgstation.Server.Host/Core/JobManager.cs b/src/Tgstation.Server.Host/Core/JobManager.cs index b9b8ba4b68..cb034f445a 100644 --- a/src/Tgstation.Server.Host/Core/JobManager.cs +++ b/src/Tgstation.Server.Host/Core/JobManager.cs @@ -247,6 +247,8 @@ namespace Tgstation.Server.Host.Core /// public int? JobProgress(Job job) { + if (job == null) + throw new ArgumentNullException(nameof(job)); lock (this) { if (!jobs.TryGetValue(job.Id, out var handler)) @@ -258,6 +260,10 @@ namespace Tgstation.Server.Host.Core /// public async Task WaitForJobCompletion(Job job, User canceller, CancellationToken jobCancellationToken, CancellationToken cancellationToken) { + if (job == null) + throw new ArgumentNullException(nameof(job)); + if (canceller == null) + throw new ArgumentNullException(nameof(canceller)); JobHandler handler; lock (this) {