Skip to content

Commit a17b797

Browse files
Put null checks in safe progress reporter.
1 parent 8757040 commit a17b797

2 files changed

Lines changed: 7 additions & 9 deletions

File tree

4.8.1/Numerics/Numerics.csproj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,7 @@
102102
<Reference Include="System.Text.Encodings.Web, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
103103
<HintPath>..\..\8.0\packages\System.Text.Encodings.Web.8.0.0\lib\net462\System.Text.Encodings.Web.dll</HintPath>
104104
</Reference>
105-
<Reference Include="System.Text.Json, Version=8.0.0.5, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
106-
<HintPath>..\..\8.0\packages\System.Text.Json.8.0.5\lib\net462\System.Text.Json.dll</HintPath>
107-
</Reference>
105+
<Reference Include="System.Text.Json, Version=8.0.0.3, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL" />
108106
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
109107
<HintPath>..\..\8.0\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
110108
</Reference>

4.8.1/Numerics/Utilities/SafeProgressReporter.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -204,15 +204,15 @@ protected void SetContext(SynchronizationContext context)
204204
/// </summary>
205205
public void IndicateTaskStart()
206206
{
207-
_synchronizationContext.Post(new SendOrPostCallback(state => TaskStarted?.Invoke()), null);
207+
_synchronizationContext?.Post(new SendOrPostCallback(state => TaskStarted?.Invoke()), null);
208208
}
209209

210210
/// <summary>
211211
/// Indicate that the task has ended.
212212
/// </summary>
213213
public void IndicateTaskEnded()
214214
{
215-
_synchronizationContext.Post(new SendOrPostCallback(state => TaskEnded?.Invoke()), null);
215+
_synchronizationContext?.Post(new SendOrPostCallback(state => TaskEnded?.Invoke()), null);
216216
}
217217

218218
/// <summary>
@@ -312,7 +312,7 @@ public SafeProgressReporter CreateProgressModifier(float fractionOfTotal, string
312312
child._cancellationTokenSource = _cancellationTokenSource;
313313
_subProgReporterCollection.Add(child);
314314
var invokeChildCreatedHandlers = new SendOrPostCallback(state => ChildReporterCreated?.Invoke(child));
315-
_synchronizationContext.Post(invokeChildCreatedHandlers, child);
315+
_synchronizationContext?.Post(invokeChildCreatedHandlers, child);
316316
return child;
317317
}
318318

@@ -335,7 +335,7 @@ public void Report(double progress, string message, MessageType messageType)
335335
public void ReportProgress(double progress)
336336
{
337337
if (_previousProgress == progress) return;
338-
_synchronizationContext.Post(_invokeProgressHandlers, new double[] { progress, _previousProgress });
338+
_synchronizationContext?.Post(_invokeProgressHandlers, new double[] { progress, _previousProgress });
339339
_previousProgress = progress;
340340
}
341341

@@ -346,7 +346,7 @@ public void ReportProgress(double progress)
346346
/// <param name="messageType">The message type.</param>
347347
public void ReportMessage(string message, MessageType messageType = MessageType.Status)
348348
{
349-
_synchronizationContext.Post(_invokeMessageHandlers, new MessageContentStruct(message, messageType, this));
349+
_synchronizationContext?.Post(_invokeMessageHandlers, new MessageContentStruct(message, messageType, this));
350350
MessageCount += 1;
351351
_previousMessage = message;
352352
_previousMessageType = messageType;
@@ -358,7 +358,7 @@ public void ReportMessage(string message, MessageType messageType = MessageType.
358358
/// <param name="message">The message to report.</param>
359359
protected void ReportMessage(MessageContentStruct message)
360360
{
361-
_synchronizationContext.Post(_invokeMessageHandlers, message);
361+
_synchronizationContext?.Post(_invokeMessageHandlers, message);
362362
MessageCount += 1;
363363
_previousMessage = message.Message;
364364
_previousMessageType = message.MessageType;

0 commit comments

Comments
 (0)