This commit was manufactured by cvs2svn to create branch 'mono-1-0'.

[mono.git] / mcs / class / System.Data / System.Data.Common / DataContainer.cs

diff --git a/mcs/class/System.Data/System.Data.Common/DataContainer.cs b/mcs/class/System.Data/System.Data.Common/DataContainer.cs
index 5b627d7d8baf288c73a412596dfc651c0d9d2208..de0d64bc598d2af8f12bf6c875a2908665455c17 100644 (file)
--- 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)