Fix possible NullReferenceException

svn path=/trunk/mcs/; revision=58574
mono · Mar 27, 2006 · 71b1164 · 71b1164
1 parent c0c7cc7
commit 71b1164
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/mcs/class/System.Data/Mono.Data.SqlExpressions/Aggregation.cs b/mcs/class/System.Data/Mono.Data.SqlExpressions/Aggregation.cs
@@ -75,13 +75,18 @@ public override bool Equals(object obj)
 			if (!other.column.Equals (column))
 				return false;		
 
+			if (other.rows != null && rows != null) {
 			if (other.rows.Length != rows.Length)
 				return false;
 
 			for (int i=0; i < rows.Length; i++)
 				if (other.rows [i] != rows [i])
 					return false;
 
+			}
+			else if (!(other.rows == null && rows == null))
+				return false;
+
 			return true;
 		}
 

diff --git a/mcs/class/System.Data/Mono.Data.SqlExpressions/ChangeLog b/mcs/class/System.Data/Mono.Data.SqlExpressions/ChangeLog
@@ -1,3 +1,6 @@
+2006-03-27	Boris Kirzner <borisk@mainsoft.com>
+	* Aggregation.cs: fix possible NullReferenceException.
+
 2006-02-03  Senganal T  <tsenganal@novell.com>
 
 	* ColumnReference.cs :