diff options
author | Marek Safar <marek.safar@gmail.com> | 2017-05-09 18:52:43 +0300 |
---|---|---|
committer | Marek Safar <marek.safar@gmail.com> | 2017-05-09 23:55:46 +0300 |
commit | ce55518eb9b79f332788510f6b3b5cadd907b947 (patch) | |
tree | 32b4c399c90f284b2b46406133079f71b5e30f53 /mcs/class/referencesource | |
parent | 3edf9da975b141a4eac13e4ea606d4a67da86641 (diff) |
Bump corefx
Diffstat (limited to 'mcs/class/referencesource')
-rw-r--r-- | mcs/class/referencesource/System.Data/System/Data/ProviderBase/DbConnectionFactory.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mcs/class/referencesource/System.Data/System/Data/ProviderBase/DbConnectionFactory.cs b/mcs/class/referencesource/System.Data/System/Data/ProviderBase/DbConnectionFactory.cs index 835b18d97a6..b62c2e9c275 100644 --- a/mcs/class/referencesource/System.Data/System/Data/ProviderBase/DbConnectionFactory.cs +++ b/mcs/class/referencesource/System.Data/System/Data/ProviderBase/DbConnectionFactory.cs @@ -304,11 +304,15 @@ namespace System.Data.ProviderBase { #endif } else { +#if !MONO + // DBConnection::ForceNewConnection is never set if (owningConnection.ForceNewConnection) { Debug.Assert(!(oldConnection is DbConnectionClosed), "Force new connection, but there is no old connection"); connection = connectionPool.ReplaceConnection(owningConnection, userOptions, oldConnection); } - else { + else +#endif + { if (!connectionPool.TryGetConnection(owningConnection, retry, userOptions, out connection)) { return false; } |