Imported Upstream version 4.3.2.467

Former-commit-id: 9c2cb47f45fa221e661ab616387c9cda183f283d
This commit is contained in:
Xamarin Public Jenkins
2016-02-22 11:00:01 -05:00
parent f302175246
commit f3e3aab35a
4097 changed files with 122406 additions and 82300 deletions

View File

@@ -27,19 +27,26 @@ namespace System.IdentityModel.Policy
{
get
{
if (empty == null)
empty = new DefaultAuthorizationContext(new DefaultEvaluationContext());
return empty;
if (LocalAppContextSwitches.EnableCachedEmptyDefaultAuthorizationContext)
{
if (empty == null)
empty = new DefaultAuthorizationContext(new DefaultEvaluationContext());
return empty;
}
else
{
return new DefaultAuthorizationContext(new DefaultEvaluationContext());
}
}
}
public override string Id
{
get
get
{
if (this.id == null)
this.id = SecurityUniqueId.Create();
return this.id.Value;
return this.id.Value;
}
}