2004-05-05 Atsushi Enomoto <atsushi@ximian.com>

	* ArithmeticExpressions.cs: avoid null exception on add operation.

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

diff --git a/mcs/class/System.Data/Mono.Data.SqlExpressions/ArithmeticExpressions.cs b/mcs/class/System.Data/Mono.Data.SqlExpressions/ArithmeticExpressions.cs
index 812049f621af52ce9df096e460906f201ef0de2f..4b140b22c88db56fd24948b7e43e568233a842f3 100644 (file)
--- a/mcs/class/System.Data/Mono.Data.SqlExpressions/ArithmeticExpressions.cs
+++ b/mcs/class/System.Data/Mono.Data.SqlExpressions/ArithmeticExpressions.cs
@@ -30,7 +30,7 @@ namespace Mono.Data.SqlExpressions {
                        object obj2 = expr2.Eval (row);
                
                        if (op == Operation.ADD && (obj1 is string || obj2 is string))
-                               return obj1.ToString() + obj2.ToString();
+                               return (obj1 != null ? obj1.ToString () : String.Empty) + (obj2 != null ? obj2.ToString () : String.Empty);
                
                        IConvertible o1 = (IConvertible)obj1;
                        IConvertible o2 = (IConvertible)obj2;

diff --git a/mcs/class/System.Data/Mono.Data.SqlExpressions/ChangeLog b/mcs/class/System.Data/Mono.Data.SqlExpressions/ChangeLog
index d01b34d525531991609ae3f96d5bcbf5f8077269..3e7ba76b610eff7c2598fb049a70620d38a4e582 100644 (file)
--- a/mcs/class/System.Data/Mono.Data.SqlExpressions/ChangeLog
+++ b/mcs/class/System.Data/Mono.Data.SqlExpressions/ChangeLog
@@ -1,3 +1,7 @@
+2004-05-05  Atsushi Enomoto <atsushi@ximian.com>
+
+       * ArithmeticExpressions.cs: avoid null exception on add operation.
+
 2004-04-29  Juraj Skripsky <juraj@hotfeet.ch>
 
        * Parser.jay: Fix rule for negative expressions.