* Mono.Mozilla/DOM/Node.cs, Mono.Mozilla/DOM/Window.cs: Fix equality

  operators

2008-11-13  Andreia Gaita <shana@jitted.com>

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

diff --git a/mcs/class/Mono.WebBrowser/ChangeLog b/mcs/class/Mono.WebBrowser/ChangeLog
index 5566074ed2250e663f76a858575ad715fd52c5aa..6304e95cd105ba2bd759d3610016974de995febb 100644 (file)
--- a/mcs/class/Mono.WebBrowser/ChangeLog
+++ b/mcs/class/Mono.WebBrowser/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-13  Andreia Gaita <shana@jitted.com> 
+
+       * Mono.Mozilla/DOM/Node.cs, Mono.Mozilla/DOM/Window.cs: Fix equality
+         operators
+
 2008-11-12  Andreia Gaita <shana@jitted.com> 
 
        * Mono.WebBrowser.dll.sources, Mono.WebBrowser2K5.csproj,

diff --git a/mcs/class/Mono.WebBrowser/Mono.Mozilla/DOM/Node.cs b/mcs/class/Mono.WebBrowser/Mono.Mozilla/DOM/Node.cs
index f1527d445037c4f1a61bf8d86046311b38a3dd47..c3f26fa233c652eb7290bc6e467d82c3c4c442d3 100644 (file)
--- a/mcs/class/Mono.WebBrowser/Mono.Mozilla/DOM/Node.cs
+++ b/mcs/class/Mono.WebBrowser/Mono.Mozilla/DOM/Node.cs
@@ -379,9 +379,12 @@ namespace Mono.Mozilla.DOM
                {
                        return this == obj as Node;
                }
-               
+
                public static bool operator == (Node left, Node right)
                {
+                       if ((object)left == null || (object)right == null)
+                               return false;
+
                        if (left == null || right == null)
                                return false;
                        return left.hashcode == right.hashcode; 
@@ -391,7 +394,7 @@ namespace Mono.Mozilla.DOM
                {
                        return !(left == right);
                }               
-               
+
                public override int GetHashCode () 
                {
                        return this.hashcode;

diff --git a/mcs/class/Mono.WebBrowser/Mono.Mozilla/DOM/Window.cs b/mcs/class/Mono.WebBrowser/Mono.Mozilla/DOM/Window.cs
index b5e6009ff8576450de7ba215a132f32df4b9dfb4..0d01d181e0006488203ea037dd8a5e713496a633 100644 (file)
--- a/mcs/class/Mono.WebBrowser/Mono.Mozilla/DOM/Window.cs
+++ b/mcs/class/Mono.WebBrowser/Mono.Mozilla/DOM/Window.cs
@@ -179,9 +179,12 @@ namespace Mono.Mozilla.DOM
                {
                        return this == obj as Window;
                }
-               
+
                public static bool operator == (Window left, Window right)
                {
+                       if ((object)left == null || (object)right == null)
+                               return false;
+
                        if (left == null || right == null)
                                return false;
                        return left.hashcode == right.hashcode; 
@@ -195,7 +198,7 @@ namespace Mono.Mozilla.DOM
                public override int GetHashCode () {
                        return hashcode;
                }               
-               
+
 #endregion
 
 #region Events