* DataContainer.cs : Bug fixes in BitDataContainer.get_Item and StringDataContainer.SetValue .

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

1 files changed, 8 insertions, 3 deletions

diff --git a/mcs/class/System.Data/System.Data.Common/DataContainer.cs b/mcs/class/System.Data/System.Data.Common/DataContainer.cs
index aea2c815f33..244876eafa6 100644
--- a/mcs/class/System.Data/System.Data.Common/DataContainer.cs
+++ b/mcs/class/System.Data/System.Data.Common/DataContainer.cs
@@ -761,7 +761,7 @@ namespace System.Data.Common
 						return DBNull.Value;
 					}
 					else {
-						return !isNull;
+						return _values[index];
 					}
 				}
 				set {
@@ -941,8 +941,13 @@ namespace System.Data.Common
 			
 			protected override void SetValue(int index, object value)
 			{
-				if ( value != null && value != DBNull.Value && !(value is string)) {
-					SetValue(index, Convert.ToString(value));
+				if ( value != null && value != DBNull.Value ) {
+					if ( value is string ) {
+						SetValue(index, (string) value);
+					}
+					else {
+						SetValue(index, Convert.ToString(value));
+					}
 					return;
 				}