diff options
| author | Atsushi Eno <atsushieno@gmail.com> | 2004-05-05 06:45:02 +0400 |
|---|---|---|
| committer | Atsushi Eno <atsushieno@gmail.com> | 2004-05-05 06:45:02 +0400 |
| commit | 5b732c062abab4c526638b98299b97da77b9d21f (patch) | |
| tree | 083181797c663f4512578805054b660364e4acf3 /mcs/class/System.Data/Mono.Data.SqlExpressions | |
| parent | f16bf50d6d6f6725523f81415730e756d0a84adf (diff) | |
2004-05-05 Atsushi Enomoto <atsushi@ximian.com>
* ArithmeticExpressions.cs: avoid null exception on add operation.
svn path=/trunk/mcs/; revision=26725
Diffstat (limited to 'mcs/class/System.Data/Mono.Data.SqlExpressions')
| -rw-r--r-- | mcs/class/System.Data/Mono.Data.SqlExpressions/ArithmeticExpressions.cs | 2 | ||||
| -rw-r--r-- | mcs/class/System.Data/Mono.Data.SqlExpressions/ChangeLog | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/mcs/class/System.Data/Mono.Data.SqlExpressions/ArithmeticExpressions.cs b/mcs/class/System.Data/Mono.Data.SqlExpressions/ArithmeticExpressions.cs index 812049f621a..4b140b22c88 100644 --- 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 d01b34d5255..3e7ba76b610 100644 --- 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. |