Review changes.

mdaigle · mdaigle · commit dda9c3d6075a · 2025-10-29T12:16:24.000-07:00
diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlInternalConnectionTds.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlInternalConnectionTds.cs
@@ -715,7 +715,7 @@ internal TdsParser Parser
             }
         }
 
-        internal string ServerProvidedFailoverPartner { get; set; }
+        internal string ServerProvidedFailoverPartner { get; private set; }
 
         internal SqlConnectionPoolGroupProviderInfo PoolGroupProviderInfo
         {
@@ -1745,7 +1745,7 @@ private void LoginNoFailover(ServerInfo serverInfo,
 
                 // When ignoring server provided failover partner, we must pass in the original failover partner from the connection string.
                 // Otherwise the pool group's failover partner designation will be updated to point to the server provided value.
-                string actualFailoverPartner = LocalAppContextSwitches.IgnoreServerProvidedFailoverPartner ? "" : ServerProvidedFailoverPartner;
+                string actualFailoverPartner = LocalAppContextSwitches.IgnoreServerProvidedFailoverPartner ? string.Empty : ServerProvidedFailoverPartner;
 
                 PoolGroupProviderInfo.FailoverCheck(false, connectionOptions, actualFailoverPartner);
             }
diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlInternalConnectionTds.cs b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlInternalConnectionTds.cs
@@ -723,7 +723,7 @@ internal TdsParser Parser
             }
         }
 
-        internal string ServerProvidedFailoverPartner { get; set; }
+        internal string ServerProvidedFailoverPartner { get; private set; }
 
         internal SqlConnectionPoolGroupProviderInfo PoolGroupProviderInfo
         {
@@ -1776,7 +1776,7 @@ private void LoginNoFailover(ServerInfo serverInfo,
 
                 // When ignoring server provided failover partner, we must pass in the original failover partner from the connection string.
                 // Otherwise the pool group's failover partner designation will be updated to point to the server provided value.
-                string actualFailoverPartner = LocalAppContextSwitches.IgnoreServerProvidedFailoverPartner ? "" : ServerProvidedFailoverPartner;
+                string actualFailoverPartner = LocalAppContextSwitches.IgnoreServerProvidedFailoverPartner ? string.Empty : ServerProvidedFailoverPartner;
 
                 PoolGroupProviderInfo.FailoverCheck(false, connectionOptions, actualFailoverPartner);
             }

Original file line number	Diff line number	Diff line change
`@@ -715,7 +715,7 @@ internal TdsParser Parser`
`715`	`715`	`}`
`716`	`716`	`}`
`717`	`717`
`718`		`- internal string ServerProvidedFailoverPartner { get; set; }`
	`718`	`+ internal string ServerProvidedFailoverPartner { get; private set; }`
`719`	`719`
`720`	`720`	`internal SqlConnectionPoolGroupProviderInfo PoolGroupProviderInfo`
`721`	`721`	`{`
`@@ -1745,7 +1745,7 @@ private void LoginNoFailover(ServerInfo serverInfo,`
`1745`	`1745`
`1746`	`1746`	`// When ignoring server provided failover partner, we must pass in the original failover partner from the connection string.`
`1747`	`1747`	`// Otherwise the pool group's failover partner designation will be updated to point to the server provided value.`
`1748`		`- string actualFailoverPartner = LocalAppContextSwitches.IgnoreServerProvidedFailoverPartner ? "" : ServerProvidedFailoverPartner;`
	`1748`	`+ string actualFailoverPartner = LocalAppContextSwitches.IgnoreServerProvidedFailoverPartner ? string.Empty : ServerProvidedFailoverPartner;`
`1749`	`1749`
`1750`	`1750`	`PoolGroupProviderInfo.FailoverCheck(false, connectionOptions, actualFailoverPartner);`
`1751`	`1751`	`}`
Original file line number	Diff line number	Diff line change
`@@ -723,7 +723,7 @@ internal TdsParser Parser`
`723`	`723`	`}`
`724`	`724`	`}`
`725`	`725`
`726`		`- internal string ServerProvidedFailoverPartner { get; set; }`
	`726`	`+ internal string ServerProvidedFailoverPartner { get; private set; }`
`727`	`727`
`728`	`728`	`internal SqlConnectionPoolGroupProviderInfo PoolGroupProviderInfo`
`729`	`729`	`{`
`@@ -1776,7 +1776,7 @@ private void LoginNoFailover(ServerInfo serverInfo,`
`1776`	`1776`
`1777`	`1777`	`// When ignoring server provided failover partner, we must pass in the original failover partner from the connection string.`
`1778`	`1778`	`// Otherwise the pool group's failover partner designation will be updated to point to the server provided value.`
`1779`		`- string actualFailoverPartner = LocalAppContextSwitches.IgnoreServerProvidedFailoverPartner ? "" : ServerProvidedFailoverPartner;`
	`1779`	`+ string actualFailoverPartner = LocalAppContextSwitches.IgnoreServerProvidedFailoverPartner ? string.Empty : ServerProvidedFailoverPartner;`
`1780`	`1780`
`1781`	`1781`	`PoolGroupProviderInfo.FailoverCheck(false, connectionOptions, actualFailoverPartner);`
`1782`	`1782`	`}`