2003-06-01 Ville Palo <vi64pa@kolumbus.fi>

	* SqlString.cs: added null checking

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

diff --git a/mcs/class/System.Data/System.Data.SqlTypes/ChangeLog b/mcs/class/System.Data/System.Data.SqlTypes/ChangeLog
index 4e64eb0dbefc1ff46589175f3526d558885b141b..0238793181b369857498e1e677c49f3a38721ff7 100644 (file)
--- a/mcs/class/System.Data/System.Data.SqlTypes/ChangeLog
+++ b/mcs/class/System.Data/System.Data.SqlTypes/ChangeLog
@@ -1,3 +1,7 @@
+2003-06-01  Ville Palo <vi64pa@kolumbus.fi>
+
+       * SqlString.cs: added null checking
+       
 2003-05-28  Ville Palo <vi64pa@kolumbus.fi>
 
        * SqlMoney.cs: little fixes and clean ups

diff --git a/mcs/class/System.Data/System.Data.SqlTypes/SqlString.cs b/mcs/class/System.Data/System.Data.SqlTypes/SqlString.cs
index 7e4ea983ae91b1309872c6e7d668f010044e4d30..3809f050012b374e3e1c9d8ee443064671b95994 100644 (file)
--- a/mcs/class/System.Data/System.Data.SqlTypes/SqlString.cs
+++ b/mcs/class/System.Data/System.Data.SqlTypes/SqlString.cs
@@ -385,6 +385,9 @@ namespace System.Data.SqlTypes
                // Concatenates
                public static SqlString operator + (SqlString x, SqlString y) 
                {
+                       if (x.IsNull || y.IsNull)
+                               return SqlString.Null;
+
                        return new SqlString (x.Value + y.Value);
                }