mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 5.4.0.167

Browse Source 
Former-commit-id: 5624ac747d633e885131e8349322922b6a59baaa
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-08-21 15:34:15 +00:00
parent e49d6f06c0
commit 536cd135cc
12856 changed files with 563812 additions and 223249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mcs/class/referencesource/System.Data/System/Data/ProviderBase/DbConnectionFactory.cs
View File

@@ -2,8 +2,8 @@
// <copyright file="DbConnectionFactory.cs" company="Microsoft">
// Copyright (c) Microsoft Corporation. All rights reserved.
// </copyright>
// <owner current="true" primary="true">[....]</owner>
// <owner current="true" primary="false">[....]</owner>
// <owner current="true" primary="true">Microsoft</owner>
// <owner current="true" primary="false">Microsoft</owner>
//------------------------------------------------------------------------------
namespace System.Data.ProviderBase {
@@ -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;
}