Skip to content

Commit 0142ecb

Browse files
committed
per feedback
1 parent ce3a5c3 commit 0142ecb

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlClientEventSource.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -897,7 +897,7 @@ internal void StateDumpEvent<T0, T1>(string message, T0 args0, T1 args1)
897897
[NonEvent]
898898
internal void StateDumpEvent<T0, T1, T2>(string message, T0 args0, T1 args1, T2 args2)
899899
{
900-
StateDump(string.Format(message, args0?.ToString() ?? NullStr, args1?.ToString() ?? NullStr, args2?.ToString()));
900+
StateDump(string.Format(message, args0?.ToString() ?? NullStr, args1?.ToString() ?? NullStr, args2?.ToString() ?? NullStr));
901901
}
902902
#endregion
903903

src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/InstanceNameTest/InstanceNameTest.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,8 +212,10 @@ private static string GetSPNInfo(string dataSource, string inInstanceName)
212212
string serverSPN = "";
213213
MethodInfo getSqlServerSPNs = sniProxyObj.GetType().GetMethod("GetSqlServerSPNs", BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic, null, CallingConventions.Any, getSqlServerSPNsTypesArray, null);
214214

215-
string spnInfo = (string)getSqlServerSPNs.Invoke(sniProxyObj, new object[] { dataSrcInfo, serverSPN });
216-
215+
object resolvedSpns = getSqlServerSPNs.Invoke(sniProxyObj, new object[] { dataSrcInfo, serverSPN });
216+
217+
string spnInfo = (string)resolvedSpns.GetType().GetProperty("Primary", BindingFlags.Instance | BindingFlags.Public).GetValue(resolvedSpns);
218+
217219
return spnInfo;
218220
}
219221

0 commit comments

Comments
 (0)