From c11604786a85488909ec730ac61641bf4f612332 Mon Sep 17 00:00:00 2001 From: Ryan Lucia Date: Mon, 15 Mar 2021 07:49:50 -0400 Subject: [PATCH] Add null check for WaitInfo (#49628) * Add null check for WaitInfo * Remove OnThreadExiting static from WaitSubsystem --- .../src/System/Threading/WaitSubsystem.Unix.cs | 5 ----- src/mono/System.Private.CoreLib/src/System/Threading/Thread.Mono.cs | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/libraries/System.Private.CoreLib/src/System/Threading/WaitSubsystem.Unix.cs b/src/libraries/System.Private.CoreLib/src/System/Threading/WaitSubsystem.Unix.cs index bd622d9..e259f38 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Threading/WaitSubsystem.Unix.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Threading/WaitSubsystem.Unix.cs @@ -424,10 +424,5 @@ namespace System.Threading s_lock.Release(); } } - - public static void OnThreadExiting(Thread thread) - { - thread.WaitInfo.OnThreadExiting(); - } } } diff --git a/src/mono/System.Private.CoreLib/src/System/Threading/Thread.Mono.cs b/src/mono/System.Private.CoreLib/src/System/Threading/Thread.Mono.cs index c1978ea..2c7c040 100644 --- a/src/mono/System.Private.CoreLib/src/System/Threading/Thread.Mono.cs +++ b/src/mono/System.Private.CoreLib/src/System/Threading/Thread.Mono.cs @@ -82,7 +82,7 @@ namespace System.Threading ~Thread() { #if TARGET_UNIX || TARGET_BROWSER - WaitSubsystem.OnThreadExiting(this); + _waitInfo?.OnThreadExiting(); #endif FreeInternal(); } -- 2.7.4