diff options
| author | Zoltan Varga <vargaz@gmail.com> | 2015-08-16 05:26:59 +0300 |
|---|---|---|
| committer | Zoltan Varga <vargaz@gmail.com> | 2015-08-16 05:27:23 +0300 |
| commit | 4fd7f72a553981a7713a285c8bdc9dc0eb7c7a42 (patch) | |
| tree | 23c42029809b9fe6bb1934a03a3d0f9ec27c8159 | |
| parent | 5345159fdd55bee964ad24981a121763ff9173a0 (diff) | |
[bcl] Fix test failures in the System.ServiceModel tests after 9ffb681d06858ed5474320ca2e7a82ccf2ce8be3.
| -rw-r--r-- | mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ChannelDispatcher.cs | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ChannelDispatcher.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ChannelDispatcher.cs index ca5e2e34c81..c005094275c 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ChannelDispatcher.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ChannelDispatcher.cs @@ -584,10 +584,14 @@ namespace System.ServiceModel.Dispatcher { Message msg; var input = (IInputChannel) result.AsyncState; - if (input.EndTryReceive (result, out msg)) - ProcessInput (input, msg); - else + try { + if (input.EndTryReceive (result, out msg)) + ProcessInput (input, msg); + else + input.Close (); + } catch (ObjectDisposedException) { input.Close (); + } } void ProcessRequest (IReplyChannel reply, RequestContext rc) |