Fix AppDomain.SetPrincipalPolicy bug for new threads (#32104) (#28019)

eiriktsarpalis · MarcoRossignoli · web-flow · commit a95569a88d35 · 2020-02-18T13:31:53.000-08:00
* fix principal policy for new threads

Fixes #31717

Co-authored-by: Marco Rossignoli &lt;marco.rossignoli@gmail.com&gt;
diff --git a/src/System.Private.CoreLib/shared/System/Threading/Thread.cs b/src/System.Private.CoreLib/shared/System/Threading/Thread.cs
@@ -136,11 +136,12 @@ public static IPrincipal? CurrentPrincipal
         {
             get
             {
-                if (s_asyncLocalPrincipal is null)
+                IPrincipal? principal = s_asyncLocalPrincipal?.Value;
+                if (principal is null)
                 {
-                    CurrentPrincipal = AppDomain.CurrentDomain.GetThreadPrincipal();
+                    CurrentPrincipal = (principal = AppDomain.CurrentDomain.GetThreadPrincipal());
                 }
-                return s_asyncLocalPrincipal?.Value;
+                return principal;
             }
             set
             {

Original file line number	Diff line number	Diff line change
`@@ -136,11 +136,12 @@ public static IPrincipal? CurrentPrincipal`
`136`	`136`	`{`
`137`	`137`	`get`
`138`	`138`	`{`
`139`		`- if (s_asyncLocalPrincipal is null)`
	`139`	`+ IPrincipal? principal = s_asyncLocalPrincipal?.Value;`
	`140`	`+ if (principal is null)`
`140`	`141`	`{`
`141`		`- CurrentPrincipal = AppDomain.CurrentDomain.GetThreadPrincipal();`
	`142`	`+ CurrentPrincipal = (principal = AppDomain.CurrentDomain.GetThreadPrincipal());`
`142`	`143`	`}`
`143`		`- return s_asyncLocalPrincipal?.Value;`
	`144`	`+ return principal;`
`144`	`145`	`}`
`145`	`146`	`set`
`146`	`147`	`{`