Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAtsushi Eno <atsushi@ximian.com>2011-02-18 10:32:01 +0300
committerAtsushi Eno <atsushi@ximian.com>2011-02-18 10:32:01 +0300
commit1e8bc9f712f64685a221d794ac7853fcf471e3bc (patch)
treed2499a6483c334cc0bd3b950d322ca3148ecd7f1 /mcs/class/System.ServiceModel.Discovery
parent3378ca880cd5a44716cfeaad5bf2e6c02323685b (diff)
Fix infinite loop in DiscoveryMessageSequence equality comparison.
Diffstat (limited to 'mcs/class/System.ServiceModel.Discovery')
-rwxr-xr-xmcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery/DiscoveryMessageSequence.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery/DiscoveryMessageSequence.cs b/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery/DiscoveryMessageSequence.cs
index 167838da270..007a7701390 100755
--- a/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery/DiscoveryMessageSequence.cs
+++ b/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery/DiscoveryMessageSequence.cs
@@ -84,12 +84,12 @@ namespace System.ServiceModel.Discovery
public static bool operator == (DiscoveryMessageSequence messageSequence1, DiscoveryMessageSequence messageSequence2)
{
- return messageSequence1 != null ? messageSequence1.Equals (messageSequence2) : messageSequence2 == null;
+ return object.ReferenceEquals (messageSequence1, null) ? object.ReferenceEquals (messageSequence2, null) : messageSequence1.Equals (messageSequence2);
}
public static bool operator != (DiscoveryMessageSequence messageSequence1, DiscoveryMessageSequence messageSequence2)
{
- return messageSequence1 == null ? messageSequence2 != null : !messageSequence1.Equals (messageSequence2);
+ return object.ReferenceEquals (messageSequence1, null) ? !object.ReferenceEquals (messageSequence2, null) : !messageSequence1.Equals (messageSequence2);
}
internal static DiscoveryMessageSequence ReadXml (XmlReader reader, DiscoveryVersion version)