diff options
Diffstat (limited to 'mcs/class/System.Data/System.Data.Common')
| -rwxr-xr-x | mcs/class/System.Data/System.Data.Common/ChangeLog | 8 | ||||
| -rw-r--r-- | mcs/class/System.Data/System.Data.Common/DataContainer.cs | 4 | ||||
| -rw-r--r-- | mcs/class/System.Data/System.Data.Common/DbDataRecord.cs | 2 |
3 files changed, 10 insertions, 4 deletions
diff --git a/mcs/class/System.Data/System.Data.Common/ChangeLog b/mcs/class/System.Data/System.Data.Common/ChangeLog index 0db883a625e..6af8fca9b77 100755 --- a/mcs/class/System.Data/System.Data.Common/ChangeLog +++ b/mcs/class/System.Data/System.Data.Common/ChangeLog @@ -1,5 +1,11 @@ -2004-06-24 Atsushi Enomoto <atsushi@ximian.com> +2004-07-21 Umadevi S <sumadevi@novell.com> + * DbDataRecord.cs - Fix for bug 58163. Return DBNull instead of null + +2004-07-07 Umadevi S <sumadevi@novell.com> + * DataContainer.cs :CheckedforNull before calling the relavant setmethods in each of the + SetItemForDataRecord method for the DateTimeClass +2004-06-24 Atsushi Enomoto <atsushi@ximian.com> * DataColumnMappingCollection.cs : fixed typo. * DbDataAdapter.cs : column mappings were not filled. diff --git a/mcs/class/System.Data/System.Data.Common/DataContainer.cs b/mcs/class/System.Data/System.Data.Common/DataContainer.cs index 5b627d7d8ba..de0d64bc598 100644 --- a/mcs/class/System.Data/System.Data.Common/DataContainer.cs +++ b/mcs/class/System.Data/System.Data.Common/DataContainer.cs @@ -1098,8 +1098,8 @@ namespace System.Data.Common { // if exception thrown, it should be caught // in the caller method - base.SetValue(index,record.GetDateTime(field)); - base.SetItemFromDataRecord(index,record,field); + if (!CheckAndSetNull(index,record,field)) + base.SetValue(index,record.GetDateTime(field)); } internal override int CompareValues(int index1, int index2) diff --git a/mcs/class/System.Data/System.Data.Common/DbDataRecord.cs b/mcs/class/System.Data/System.Data.Common/DbDataRecord.cs index 0a6fa0e868d..69a2013f64d 100644 --- a/mcs/class/System.Data/System.Data.Common/DbDataRecord.cs +++ b/mcs/class/System.Data/System.Data.Common/DbDataRecord.cs @@ -340,7 +340,7 @@ namespace System.Data.Common { public bool IsDBNull (int i) { - return GetValue (i) == null; + return GetValue (i) == DBNull.Value; } #if NET_2_0 public virtual bool IsSetAsDefault (int i) |