From d9ad5358bdd6378f19cd0f38d010106c04854c0d Mon Sep 17 00:00:00 2001 From: jbevain Date: Wed, 30 Sep 2009 08:43:02 +0000 Subject: [PATCH] 2009-09-30 Jb Evain * HttpRequestChannel.cs: When compiling for MonoTouch, avoid to use any of the remoting features. git-svn-id: svn+ssh://mono-cvs.ximian.com/source/trunk/mcs@142970 e3ebcda4-bce8-0310-ba0a-eca2169e7518 --- .../System.ServiceModel/System.ServiceModel.Channels/ChangeLog | 5 +++++ .../System.ServiceModel.Channels/HttpRequestChannel.cs | 10 +++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog b/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog index c41215c4cf..5763ff48c6 100755 --- a/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog +++ b/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog @@ -1,3 +1,8 @@ +2009-09-30 Jb Evain + + * HttpRequestChannel.cs: When compiling for MonoTouch, avoid + to use any of the remoting features. + 2009-09-30 Atsushi Enomoto * SvcHttpHandlerFactory.cs, HttpTransportBindingElement.cs : diff --git a/class/System.ServiceModel/System.ServiceModel.Channels/HttpRequestChannel.cs b/class/System.ServiceModel/System.ServiceModel.Channels/HttpRequestChannel.cs index 20ec700827..a3fa1180d5 100644 --- a/class/System.ServiceModel/System.ServiceModel.Channels/HttpRequestChannel.cs +++ b/class/System.ServiceModel/System.ServiceModel.Channels/HttpRequestChannel.cs @@ -333,10 +333,18 @@ w.Close (); public void WaitEnd () { if (!IsCompleted) { + + const bool exit_context = +#if MONOTOUCH + false; // MonoTouch doesn't support any remoting feature +#else + true; +#endif + // FIXME: Do we need to use the timeout? If so, what happens when the timeout is reached. // Is the current request cancelled and an exception thrown? If so we need to pass the // exception to the Complete () method and allow the result to complete 'normally'. - if (!wait.WaitOne (Timeout, true)) + if (!wait.WaitOne (Timeout, exit_context)) throw new TimeoutException (); } if (error != null) -- 2.11.4.GIT