2008-06-12 Atsushi Enomoto <atsushi@ximian.com>

	* SqlDateTime.cs, SqlDecimal.cs, SqlInt32.cs, SqlInt16.cs,
	  SqlByte.cs, SqlInt64.cs, SqlString.cs, SqlDouble.cs,
	  SqlSingle.cs, SqlBinary.cs, SqlMoney.cs, SqlGuid.cs:
	  ok, everything needs the same fix.
	  (Do not let me write exhausting tests for everything.)

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

diff --git a/mcs/class/System.Data/System.Data.SqlTypes/ChangeLog b/mcs/class/System.Data/System.Data.SqlTypes/ChangeLog
index 5474e4e48c94db2b5a2e961a2085f7df81f69c21..6f3dcb8aa82dda941f80d23c5a9efd6200e2612b 100644 (file)
--- a/mcs/class/System.Data/System.Data.SqlTypes/ChangeLog
+++ b/mcs/class/System.Data/System.Data.SqlTypes/ChangeLog
@@ -1,3 +1,11 @@
+2008-06-12  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * SqlDateTime.cs, SqlDecimal.cs, SqlInt32.cs, SqlInt16.cs,
+         SqlByte.cs, SqlInt64.cs, SqlString.cs, SqlDouble.cs,
+         SqlSingle.cs, SqlBinary.cs, SqlMoney.cs, SqlGuid.cs:
+         ok, everything needs the same fix.
+         (Do not let me write exhausting tests for everything.)
+
 2008-06-12  Atsushi Enomoto  <atsushi@ximian.com>
 
        * SqlBoolean.cs : SqlBoolean.Null.Equals(non-null) caused crash.

diff --git a/mcs/class/System.Data/System.Data.SqlTypes/SqlBinary.cs b/mcs/class/System.Data/System.Data.SqlTypes/SqlBinary.cs
index 578a71503c3ed48195a45624981cb88a94bb5dca..940436bfcfab3b1d63d5237509b71a0d1ce93e70 100644 (file)
--- a/mcs/class/System.Data/System.Data.SqlTypes/SqlBinary.cs
+++ b/mcs/class/System.Data/System.Data.SqlTypes/SqlBinary.cs
@@ -148,8 +148,8 @@ namespace System.Data.SqlTypes
                {
                        if (!(value is SqlBinary))
                                return false;
-                       else if (this.IsNull && ((SqlBinary)value).IsNull)
-                               return true;
+                       else if (this.IsNull)
+                               return ((SqlBinary)value).IsNull;
                        else if (((SqlBinary)value).IsNull)
                                return false;
                        else

diff --git a/mcs/class/System.Data/System.Data.SqlTypes/SqlByte.cs b/mcs/class/System.Data/System.Data.SqlTypes/SqlByte.cs
index 1d4a980a3ba862db47a71fa7ecd6d1a23f20a278..ac6ba3c05af0fd883e6e9e4070423784949dbd4c 100644 (file)
--- a/mcs/class/System.Data/System.Data.SqlTypes/SqlByte.cs
+++ b/mcs/class/System.Data/System.Data.SqlTypes/SqlByte.cs
@@ -137,8 +137,8 @@ namespace System.Data.SqlTypes
                {
                        if (!(value is SqlByte))
                                return false;
-                       else if (this.IsNull && ((SqlByte)value).IsNull)
-                                return true;
+                       else if (this.IsNull)
+                               return ((SqlByte)value).IsNull;
                        else if (((SqlByte)value).IsNull)
                                return false;
                        else

diff --git a/mcs/class/System.Data/System.Data.SqlTypes/SqlDateTime.cs b/mcs/class/System.Data/System.Data.SqlTypes/SqlDateTime.cs
index 095b168bf27e839797410e9a4740044398c9409b..ce51dba98d7efe1c559e415ef8bf174954686453 100644 (file)
--- a/mcs/class/System.Data/System.Data.SqlTypes/SqlDateTime.cs
+++ b/mcs/class/System.Data/System.Data.SqlTypes/SqlDateTime.cs
@@ -220,8 +220,8 @@ namespace System.Data.SqlTypes
                {
                        if (!(value is SqlDateTime))
                                return false;
-                       else if (this.IsNull && ((SqlDateTime)value).IsNull)
-                               return true;
+                       else if (this.IsNull)
+                               return ((SqlDateTime)value).IsNull;
                        else if (((SqlDateTime)value).IsNull)
                                return false;
                        else

diff --git a/mcs/class/System.Data/System.Data.SqlTypes/SqlDecimal.cs b/mcs/class/System.Data/System.Data.SqlTypes/SqlDecimal.cs
index e0546456bafe474b94e16f5f24632c8a8991fbdf..d69e0171d7f10bb8c5c9a4c375da25abccec3e26 100644 (file)
--- a/mcs/class/System.Data/System.Data.SqlTypes/SqlDecimal.cs
+++ b/mcs/class/System.Data/System.Data.SqlTypes/SqlDecimal.cs
@@ -330,8 +330,8 @@ namespace System.Data.SqlTypes
                {
                        if (!(value is SqlDecimal))
                                return false;
-                       else if (this.IsNull && ((SqlDecimal)value).IsNull)
-                               return true;
+                       else if (this.IsNull)
+                               return ((SqlDecimal)value).IsNull;
                        else if (((SqlDecimal)value).IsNull)
                                return false;
                        else

diff --git a/mcs/class/System.Data/System.Data.SqlTypes/SqlDouble.cs b/mcs/class/System.Data/System.Data.SqlTypes/SqlDouble.cs
index 321d7af0b2604cd8686c126c1e6dc176eafd0369..60b27432d063fbb74ac0aed7a4b4295487f61e55 100644 (file)
--- a/mcs/class/System.Data/System.Data.SqlTypes/SqlDouble.cs
+++ b/mcs/class/System.Data/System.Data.SqlTypes/SqlDouble.cs
@@ -124,8 +124,8 @@ namespace System.Data.SqlTypes
                {
                        if (!(value is SqlDouble))
                                return false;
-                       if (this.IsNull && ((SqlDouble)value).IsNull)
-                               return true;
+                       if (this.IsNull)
+                               return ((SqlDouble)value).IsNull;
                        else if (((SqlDouble)value).IsNull)
                                return false;
                        else

diff --git a/mcs/class/System.Data/System.Data.SqlTypes/SqlGuid.cs b/mcs/class/System.Data/System.Data.SqlTypes/SqlGuid.cs
index 571485dd30e4a655356ab9b94a7b04b8e3a37cf9..11519064d247d3bb061e5a28b826b9b4ceaeaaf1 100644 (file)
--- a/mcs/class/System.Data/System.Data.SqlTypes/SqlGuid.cs
+++ b/mcs/class/System.Data/System.Data.SqlTypes/SqlGuid.cs
@@ -175,8 +175,8 @@ namespace System.Data.SqlTypes
                {
                        if (!(value is SqlGuid))
                                return false;
-                       else if (this.IsNull && ((SqlGuid)value).IsNull)
-                               return true;
+                       else if (this.IsNull)
+                               return ((SqlGuid)value).IsNull;
                        else if (((SqlGuid)value).IsNull)
                                return false;
                        else

diff --git a/mcs/class/System.Data/System.Data.SqlTypes/SqlInt16.cs b/mcs/class/System.Data/System.Data.SqlTypes/SqlInt16.cs
index f65a9a569a0b6e54b50b91555617f5b7d266dbe4..351b84e77162b24867f3de09fad22eb784b9bc12 100644 (file)
--- a/mcs/class/System.Data/System.Data.SqlTypes/SqlInt16.cs
+++ b/mcs/class/System.Data/System.Data.SqlTypes/SqlInt16.cs
@@ -137,8 +137,8 @@ namespace System.Data.SqlTypes
                {
                        if (!(value is SqlInt16))
                                return false;
-                       else if (this.IsNull && ((SqlInt16)value).IsNull)
-                               return true;
+                       else if (this.IsNull)
+                               return ((SqlInt16)value).IsNull;
                        else if (((SqlInt16)value).IsNull)
                                return false;
                        else

diff --git a/mcs/class/System.Data/System.Data.SqlTypes/SqlInt32.cs b/mcs/class/System.Data/System.Data.SqlTypes/SqlInt32.cs
index aa2b6ef90361276b21358296db16c314de7fbe1a..263ba6879d7f054cc27b3d3e78a57eff36513da5 100644 (file)
--- a/mcs/class/System.Data/System.Data.SqlTypes/SqlInt32.cs
+++ b/mcs/class/System.Data/System.Data.SqlTypes/SqlInt32.cs
@@ -145,8 +145,8 @@ namespace System.Data.SqlTypes
                {
                        if (!(value is SqlInt32))
                                return false;
-                       else if (this.IsNull && ((SqlInt32)value).IsNull)
-                               return true;
+                       else if (this.IsNull)
+                               return ((SqlInt32)value).IsNull;
                        else if (((SqlInt32)value).IsNull)
                                return false;
                        else

diff --git a/mcs/class/System.Data/System.Data.SqlTypes/SqlInt64.cs b/mcs/class/System.Data/System.Data.SqlTypes/SqlInt64.cs
index 4887e04e38f0e59fd9afdef89e547830d2f40cce..a7cb6055117d344e9c6050297d4cfc8d303d8666 100644 (file)
--- a/mcs/class/System.Data/System.Data.SqlTypes/SqlInt64.cs
+++ b/mcs/class/System.Data/System.Data.SqlTypes/SqlInt64.cs
@@ -138,8 +138,8 @@ namespace System.Data.SqlTypes
                {
                        if (!(value is SqlInt64))
                                return false;
-                       else if (this.IsNull && ((SqlInt64)value).IsNull)
-                               return true;
+                       else if (this.IsNull)
+                               return ((SqlInt64)value).IsNull;
                        else if (((SqlInt64)value).IsNull)
                                return false;
                        else

diff --git a/mcs/class/System.Data/System.Data.SqlTypes/SqlMoney.cs b/mcs/class/System.Data/System.Data.SqlTypes/SqlMoney.cs
index 41fde43eec019982c3891c58c97c30775b996b5c..32956abdf9eb3347fe2f9e675970e4d58b138f87 100644 (file)
--- a/mcs/class/System.Data/System.Data.SqlTypes/SqlMoney.cs
+++ b/mcs/class/System.Data/System.Data.SqlTypes/SqlMoney.cs
@@ -150,8 +150,8 @@ namespace System.Data.SqlTypes
                {
                        if (!(value is SqlMoney))
                                return false;
-                       if (this.IsNull && ((SqlMoney)value).IsNull)
-                               return true;
+                       if (this.IsNull)
+                               return ((SqlMoney)value).IsNull;
                        else if (((SqlMoney)value).IsNull)
                                return false;
                        else

diff --git a/mcs/class/System.Data/System.Data.SqlTypes/SqlSingle.cs b/mcs/class/System.Data/System.Data.SqlTypes/SqlSingle.cs
index c3676b6011693e130e68764089535cb0c4d4697f..81b74ec25ddbae2b89dfbb60c4b532def04baebf 100644 (file)
--- a/mcs/class/System.Data/System.Data.SqlTypes/SqlSingle.cs
+++ b/mcs/class/System.Data/System.Data.SqlTypes/SqlSingle.cs
@@ -134,8 +134,8 @@ namespace System.Data.SqlTypes
                {
                        if (!(value is SqlSingle))
                                return false;
-                       else if (this.IsNull && ((SqlSingle)value).IsNull)
-                               return true;
+                       else if (this.IsNull)
+                               return ((SqlSingle)value).IsNull;
                        else if (((SqlSingle)value).IsNull)
                                return false;
                        else

diff --git a/mcs/class/System.Data/System.Data.SqlTypes/SqlString.cs b/mcs/class/System.Data/System.Data.SqlTypes/SqlString.cs
index d73bd57eda5b41786c30abfce7eb6189f5f250ab..02d903a48df2c6529155036b31f3080e1d5ce1ad 100644 (file)
--- a/mcs/class/System.Data/System.Data.SqlTypes/SqlString.cs
+++ b/mcs/class/System.Data/System.Data.SqlTypes/SqlString.cs
@@ -289,8 +289,8 @@ namespace System.Data.SqlTypes
                {
                        if (!(value is SqlString))
                                return false;
-                       if (this.IsNull && ((SqlString)value).IsNull)
-                               return true;
+                       if (this.IsNull)
+                               return ((SqlString)value).IsNull;
                        else if (((SqlString)value).IsNull)
                                return false;
                        else