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

@@ -19,7 +19,7 @@ namespace System.Web {
internal sealed class LegacyAspNetSynchronizationContext : AspNetSynchronizationContextBase {
private HttpApplication _application;
private Action _appVerifierCallback;
private Action<bool> _appVerifierCallback;
private bool _disabled;
private bool _syncCaller;
private bool _invalidOperationEncountered;
@@ -34,14 +34,14 @@ namespace System.Web {
_lastCompletionCallbackLock = new object();
}
private void CheckForRequestCompletionIfRequired() {
private void CheckForRequestStateIfRequired() {
if (_appVerifierCallback != null) {
_appVerifierCallback();
_appVerifierCallback(false);
}
}
private void CallCallback(SendOrPostCallback callback, Object state) {
CheckForRequestCompletionIfRequired();
CheckForRequestStateIfRequired();
// don't take app lock for [....] caller to avoid deadlocks in case they poll for result
if (_syncCaller) {