Fix | Fix trace string bug (#940)

dotnet · Mar 2, 2021 · 25d2413 · 25d2413
1 parent ce4605d
commit 25d2413
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 26 deletions.
diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParser.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParser.cs
@@ -12767,16 +12767,15 @@ internal string TraceString()
         {
             return string.Format(/*IFormatProvider*/ null,
                            StateTraceFormatString,
-                           null == _physicalStateObj ? bool.TrueString : bool.FalseString,
-                           null == _pMarsPhysicalConObj ? bool.TrueString : bool.FalseString,
+                           null == _physicalStateObj ? "(null)" : _physicalStateObj.ObjectID.ToString((IFormatProvider)null),
+                           null == _pMarsPhysicalConObj ? "(null)" : _pMarsPhysicalConObj.ObjectID.ToString((IFormatProvider)null),
                            _state,
                            _server,
                            _fResetConnection ? bool.TrueString : bool.FalseString,
                            null == _defaultCollation ? "(null)" : _defaultCollation.TraceString(),
                            _defaultCodePage,
                            _defaultLCID,
                            TraceObjectClass(_defaultEncoding),
-                           "",
                            _encryptionOption,
                            null == _currentTransaction ? "(null)" : _currentTransaction.TraceString(),
                            null == _pendingTransaction ? "(null)" : _pendingTransaction.TraceString(),

diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParser.cs b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParser.cs
@@ -13673,41 +13673,40 @@ internal ulong PlpBytesTotalLength(TdsParserStateObject stateObj)
                                         + "         _defaultCodePage = {6}\n\t"
                                         + "         _defaultLCID = {7}\n\t"
                                         + "         _defaultEncoding = {8}\n\t"
-                                        + "         _encryptionOption = {10}\n\t"
-                                        + "         _currentTransaction = {11}\n\t"
-                                        + "         _pendingTransaction = {12}\n\t"
-                                        + "         _retainedTransactionId = {13}\n\t"
-                                        + "         _nonTransactedOpenResultCount = {14}\n\t"
-                                        + "         _connHandler = {15}\n\t"
-                                        + "         _fMARS = {16}\n\t"
-                                        + "         _sessionPool = {17}\n\t"
-                                        + "         _isShiloh = {18}\n\t"
-                                        + "         _isShilohSP1 = {19}\n\t"
-                                        + "         _isYukon = {20}\n\t"
-                                        + "         _sniSpnBuffer = {21}\n\t"
-                                        + "         _errors = {22}\n\t"
-                                        + "         _warnings = {23}\n\t"
-                                        + "         _attentionErrors = {24}\n\t"
-                                        + "         _attentionWarnings = {25}\n\t"
-                                        + "         _statistics = {26}\n\t"
-                                        + "         _statisticsIsInTransaction = {27}\n\t"
-                                        + "         _fPreserveTransaction = {28}"
-                                        + "         _fParallel = {29}"
+                                        + "         _encryptionOption = {9}\n\t"
+                                        + "         _currentTransaction = {10}\n\t"
+                                        + "         _pendingTransaction = {11}\n\t"
+                                        + "         _retainedTransactionId = {12}\n\t"
+                                        + "         _nonTransactedOpenResultCount = {13}\n\t"
+                                        + "         _connHandler = {14}\n\t"
+                                        + "         _fMARS = {15}\n\t"
+                                        + "         _sessionPool = {16}\n\t"
+                                        + "         _isShiloh = {17}\n\t"
+                                        + "         _isShilohSP1 = {18}\n\t"
+                                        + "         _isYukon = {19}\n\t"
+                                        + "         _sniSpnBuffer = {20}\n\t"
+                                        + "         _errors = {21}\n\t"
+                                        + "         _warnings = {22}\n\t"
+                                        + "         _attentionErrors = {23}\n\t"
+                                        + "         _attentionWarnings = {24}\n\t"
+                                        + "         _statistics = {25}\n\t"
+                                        + "         _statisticsIsInTransaction = {26}\n\t"
+                                        + "         _fPreserveTransaction = {27}"
+                                        + "         _fParallel = {28}"
                                         ;
         internal string TraceString()
         {
             return string.Format(/*IFormatProvider*/ null,
                             StateTraceFormatString,
-                            null == _physicalStateObj ? bool.TrueString : bool.FalseString,
-                            null == _pMarsPhysicalConObj ? bool.TrueString : bool.FalseString,
+                            null == _physicalStateObj ? "(null)" : _physicalStateObj.ObjectID.ToString((IFormatProvider)null),
+                            null == _pMarsPhysicalConObj ? "(null)" : _pMarsPhysicalConObj.ObjectID.ToString((IFormatProvider)null),
                             _state,
                             _server,
                             _fResetConnection ? bool.TrueString : bool.FalseString,
                             null == _defaultCollation ? "(null)" : _defaultCollation.TraceString(),
                             _defaultCodePage,
                             _defaultLCID,
                             TraceObjectClass(_defaultEncoding),
-                            "",
                             _encryptionOption,
                             null == _currentTransaction ? "(null)" : _currentTransaction.TraceString(),
                             null == _pendingTransaction ? "(null)" : _pendingTransaction.TraceString(),