2009-09-30 Jb Evain <jbevain@novell.com>

	* HttpRequestChannel.cs: When compiling for MonoTouch, avoid
	to use any of the remoting features.

svn path=/trunk/mcs/; revision=142970

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog
index c41215c4cff82c5f7ebaaa392401ad8292821e3a..5763ff48c6ae3d80bbaf2989bc200d37ff1f5866 100755 (executable)
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-30  Jb Evain  <jbevain@novell.com>
+
+       * HttpRequestChannel.cs: When compiling for MonoTouch, avoid
+       to use any of the remoting features.
+
 2009-09-30  Atsushi Enomoto  <atsushi@ximian.com>
 
        * SvcHttpHandlerFactory.cs, HttpTransportBindingElement.cs :

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/HttpRequestChannel.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/HttpRequestChannel.cs
index 20ec700827a8b7824f553aa74444ff1f7da832c0..a3fa1180d51ecaa611f220ceb04a5f8a26b027e3 100644 (file)
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/HttpRequestChannel.cs
+++ b/mcs/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)