CrossRegionHedging: Fixes CosmosNullReference Bug implementing recommendations

Author: dibahlfi

Microsoft.Azure.Cosmos/src/Routing/AvailabilityStrategy/CrossRegionHedgingAvailabilityStrategy.cs

@@ -143,7 +143,8 @@ internal override async Task<ResponseMessage> ExecuteAvailabilityStrategyAsync(
                                         request,
                                         hedgeRegions.ElementAt(requestNumber),
                                         cancellationToken,
-                                        cancellationTokenSource, trace);
+                                        cancellationTokenSource, 
+                                        trace);
 
                                     requestTasks.Add(primaryRequest);
                                 }
@@ -262,7 +263,8 @@ private async Task<HedgingResponse> CloneAndSendAsync(
                     clonedRequest,
                     region,
                     cancellationToken,
-                    cancellationTokenSource, trace);
+                    cancellationTokenSource, 
+                    trace);
             }
         }
 
@@ -271,7 +273,8 @@ private async Task<HedgingResponse> RequestSenderAndResultCheckAsync(
             RequestMessage request,
             string hedgedRegion,
             CancellationToken cancellationToken,
-            CancellationTokenSource cancellationTokenSource, ITrace trace)
+            CancellationTokenSource cancellationTokenSource,
+            ITrace trace)
         {
             try
             {

Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/CosmosAvailabilityStrategyTests.cs

@@ -842,7 +842,6 @@ public async Task AvailabilityStrategyStepTests(string operation, string condito
 
         [TestMethod]
         [TestCategory("MultiRegion")]
-        [ExpectedException(typeof(CosmosOperationCanceledException))]
         public async Task AvailabilityStrategyWithCancellationTokenThrowsExceptionTest()
         {
             FaultInjectionRule responseDelay = new FaultInjectionRuleBuilder(
@@ -885,10 +884,11 @@ public async Task AvailabilityStrategyWithCancellationTokenThrowsExceptionTest()
                 Database database = faultInjectionClient.GetDatabase(CosmosAvailabilityStrategyTests.dbName);
                 Container container = database.GetContainer(CosmosAvailabilityStrategyTests.containerName);
 
-                ItemResponse<AvailabilityStrategyTestObject> ir = await container.ReadItemAsync<AvailabilityStrategyTestObject>(
-                "testId",
-                    new PartitionKey("pk"), cancellationToken: cts.Token
-                    );
+                CosmosOperationCanceledException cancelledException = await Assert.ThrowsExceptionAsync<CosmosOperationCanceledException>(() =>
+                        container.ReadItemAsync<AvailabilityStrategyTestObject>(
+                            "testId",
+                            new PartitionKey("pk"), cancellationToken: cts.Token
+                    ));
 
             }