Imported Upstream version 5.4.0.167

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

View File

@ -118,7 +118,7 @@ namespace System.Activities.DurableInstancing
SqlCommandAsyncResult thisPtr = (SqlCommandAsyncResult) state;
try
{
// this can throw on the [....] path - we need to signal the callback
// this can throw on the sync path - we need to signal the callback
thisPtr.StartCommandInternal(false);
}
catch (Exception e)
@ -171,7 +171,7 @@ namespace System.Activities.DurableInstancing
this.sqlCommand.Connection.Close();
}
// If we completed [....] then any retry is done by the original caller.
// If we completed sync then any retry is done by the original caller.
if (!result.CompletedSynchronously)
{
if (this.CheckRetryCountAndTimer() && ShouldRetryForSqlError(exception.Number, RetryErrorOptions.RetryOnEnd))