Cosmetic exception type change and suppress test failures.

diff --git a/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery.Version11/DiscoveryTargetClient11.cs b/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery.Version11/DiscoveryTargetClient11.cs
index 136b3d39d3061e04ca1bf968187954d8fcf76a48..2ccf43518a16e12b72d3ec8bdb021b2c80103205 100644 (file)
--- a/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery.Version11/DiscoveryTargetClient11.cs
+++ b/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery.Version11/DiscoveryTargetClient11.cs
@@ -81,7 +81,7 @@ namespace System.ServiceModel.Discovery.Version11
                        }, null);
                        
                        if (!reply_find_handle.WaitOne (InnerChannel.OperationTimeout))
-                               throw new TimeoutException ();
+                               throw new EndpointNotFoundException ("The discovery client could not receive Find operation response within the operation timeout.");
                        try {
                                var ir = find_completed ();
                                var ret = new FindResponse ();

diff --git a/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery.VersionApril2005/DiscoveryTargetClientApril2005.cs b/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery.VersionApril2005/DiscoveryTargetClientApril2005.cs
index 2c616d339d1fc571c8c21aabf6a155923b318b51..1c640b10d338af648d536c87b7d65d680879b5e3 100644 (file)
--- a/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery.VersionApril2005/DiscoveryTargetClientApril2005.cs
+++ b/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery.VersionApril2005/DiscoveryTargetClientApril2005.cs
@@ -81,7 +81,7 @@ namespace System.ServiceModel.Discovery.VersionApril2005
                        }, null);
                        
                        if (!reply_find_handle.WaitOne (InnerChannel.OperationTimeout))
-                               throw new TimeoutException ();
+                               throw new EndpointNotFoundException ("The discovery client could not receive Find operation response within the operation timeout.");
                        try {
                                var ir = find_completed ();
                                var ret = new FindResponse ();

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 77931da051a86b6161912963e4e88bfbd0d3f3a8..b36c7fc9e0979d694f57ccbb49edd7f957b4d8d3 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
@@ -81,7 +81,7 @@ namespace System.ServiceModel.Discovery.VersionCD1
                        }, null);
                        
                        if (!reply_find_handle.WaitOne (InnerChannel.OperationTimeout))
-                               throw new TimeoutException ();
+                               throw new EndpointNotFoundException ("The discovery client could not receive Find operation response within the operation timeout.");
                        try {
                                var ir = find_completed ();
                                var ret = new FindResponse ();