Imported Upstream version 4.3.2.467

Former-commit-id: 9c2cb47f45fa221e661ab616387c9cda183f283d
This commit is contained in:
Xamarin Public Jenkins
2016-02-22 11:00:01 -05:00
parent f302175246
commit f3e3aab35a
4097 changed files with 122406 additions and 82300 deletions

View File

@@ -128,7 +128,7 @@ namespace System.Data.Common {
foreach(string keyword in Keys) {
object value;
if (ShouldSerialize(keyword) && TryGetValue(keyword, out value)) {
string keyvalue = (null != value) ? Convert.ToString(value, CultureInfo.InvariantCulture) : (string)null;
string keyvalue = ConvertValueToString(value);
AppendKeyValuePair(builder, keyword, keyvalue, UseOdbcRules);
}
}
@@ -213,6 +213,10 @@ namespace System.Data.Common {
}
}
internal virtual string ConvertValueToString(object value) {
return (value == null) ? (string)null : Convert.ToString(value, CultureInfo.InvariantCulture);
}
void System.Collections.IDictionary.Add(object keyword, object value) {
Add(ObjectToString(keyword), value);
}