Merge pull request #5668 from kumpera/wasm-work-p4

[mono.git] / mcs / class / System.ServiceModel.Discovery / System.ServiceModel.Discovery.VersionCD1 / DiscoveryTargetClientCD1.cs

diff --git a/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery.VersionCD1/DiscoveryTargetClientCD1.cs b/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery.VersionCD1/DiscoveryTargetClientCD1.cs
index b36c7fc9e0979d694f57ccbb49edd7f957b4d8d3..7d1f9b4c60b90edfffe3c401dde632b7c2a658d0 100644 (file)
--- a/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery.VersionCD1/DiscoveryTargetClientCD1.cs
+++ b/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery.VersionCD1/DiscoveryTargetClientCD1.cs
@@ -80,7 +80,8 @@ namespace System.ServiceModel.Discovery.VersionCD1
                                Channel.EndFind (result);
                        }, null);
                        
-                       if (!reply_find_handle.WaitOne (InnerChannel.OperationTimeout))
+                       var timeout = InnerChannel.OperationTimeout < criteria.Duration ? InnerChannel.OperationTimeout : criteria.Duration;
+                       if (!reply_find_handle.WaitOne (timeout))
                                throw new EndpointNotFoundException ("The discovery client could not receive Find operation response within the operation timeout.");
                        try {
                                var ir = find_completed ();
@@ -118,7 +119,8 @@ namespace System.ServiceModel.Discovery.VersionCD1
                                Channel.EndResolve (result);
                        }, null);
 
-                       if (!reply_resolve_handle.WaitOne (InnerChannel.OperationTimeout))
+                       var timeout = InnerChannel.OperationTimeout < criteria.Duration ? InnerChannel.OperationTimeout : criteria.Duration;
+                       if (!reply_find_handle.WaitOne (timeout))
                                throw new TimeoutException ();
                        try {
                                var ir = resolve_completed ();