Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Safar <masafa@microsoft.com>2016-08-08 19:30:44 +0300
committerMarek Safar <masafa@microsoft.com>2016-08-09 19:07:14 +0300
commitb6a30059db8319348ebb454cc303633dfabd6a29 (patch)
treedfaa5b26537a6d5d0fbea0f13da9573b16d37f3e /mcs/class/referencesource/System.ServiceModel.Activation
parentf34c0223fce6b42ebfbe82ddc257095e5c490d10 (diff)
[bcl] Update Reference Source to .NET Framework 4.6.2
Diffstat (limited to 'mcs/class/referencesource/System.ServiceModel.Activation')
-rw-r--r--mcs/class/referencesource/System.ServiceModel.Activation/System/ServiceModel/Activation/HostedAspNetEnvironment.cs13
1 files changed, 2 insertions, 11 deletions
diff --git a/mcs/class/referencesource/System.ServiceModel.Activation/System/ServiceModel/Activation/HostedAspNetEnvironment.cs b/mcs/class/referencesource/System.ServiceModel.Activation/System/ServiceModel/Activation/HostedAspNetEnvironment.cs
index c0dc0f32928..4e785e5b1ff 100644
--- a/mcs/class/referencesource/System.ServiceModel.Activation/System/ServiceModel/Activation/HostedAspNetEnvironment.cs
+++ b/mcs/class/referencesource/System.ServiceModel.Activation/System/ServiceModel/Activation/HostedAspNetEnvironment.cs
@@ -101,20 +101,13 @@ namespace System.ServiceModel.Activation
}
}
- // Provides the version of the WebSocket protocol supported by IIS. Throws an exception if called before we determined the value.
+ // Provides the version of the WebSocket protocol supported by IIS.
// Returns null if WebSockets are not supported (because the IIS WebSocketModule is not installed or enabled).
public override string WebSocketVersion
{
get
{
- if (isWebSocketVersionSet)
- {
- return webSocketVersion;
- }
- else
- {
- throw Fx.AssertAndFailFast("The supported WebSocket protocol version is not determined at this time.");
- }
+ return isWebSocketVersionSet ? webSocketVersion : null;
}
}
@@ -136,8 +129,6 @@ namespace System.ServiceModel.Activation
/// </remarks>
public static void TrySetWebSocketVersion(HttpApplication application)
{
- Fx.Assert(application != null, "Invalid argument.");
-
if (!isWebSocketVersionSet)
{
webSocketVersion = application.Request.ServerVariables[WebSocketVersionServerProperty];