Fix for #274 , response handler logic being called instead of skipped…

… for .NET 3.5 async, when an exception is thrown in the pipeline.
aws · Nov 19, 2015 · c68badb · c68badb
1 parent ff7ef4b
commit c68badb
Show file tree

Hide file tree

Showing 9 changed files with 61 additions and 15 deletions.
diff --git a/sdk/src/Core/Amazon.Runtime/AmazonServiceClient.cs b/sdk/src/Core/Amazon.Runtime/AmazonServiceClient.cs
@@ -243,8 +243,6 @@ protected void ProcessRequestHandlers(IExecutionContext executionContext)
 
         protected void ProcessResponseHandlers(IExecutionContext executionContext)
         {
-            //if (request == null)
-            //    return;
             if (AfterResponseEvent == null)
                 return;
 
@@ -258,8 +256,6 @@ protected void ProcessResponseHandlers(IExecutionContext executionContext)
 
         protected virtual void ProcessExceptionHandlers(IExecutionContext executionContext, Exception exception)
         {
-            //if (request == null)
-            //    return;
             if (ExceptionEvent == null)
                 return;
 

diff --git a/sdk/src/Core/Amazon.Runtime/Pipeline/Handlers/CallbackHandler.cs b/sdk/src/Core/Amazon.Runtime/Pipeline/Handlers/CallbackHandler.cs
@@ -85,7 +85,11 @@ public override IAsyncResult InvokeAsync(IAsyncExecutionContext executionContext
         /// request and response context.</param>
         protected override void InvokeAsyncCallback(IAsyncExecutionContext executionContext)
         {
-            PostInvoke(ExecutionContext.CreateFromAsyncContext(executionContext));
+            // Process the response if an exception hasn't occured
+            if (executionContext.ResponseContext.AsyncResult.Exception == null)
+            {
+                PostInvoke(ExecutionContext.CreateFromAsyncContext(executionContext));
+            }
             base.InvokeAsyncCallback(executionContext);
         }
 #endif

diff --git a/sdk/src/Core/Amazon.Runtime/Pipeline/Handlers/RedirectHandler.cs b/sdk/src/Core/Amazon.Runtime/Pipeline/Handlers/RedirectHandler.cs
@@ -71,11 +71,16 @@ public override async System.Threading.Tasks.Task<T> InvokeAsync<T>(IExecutionCo
         /// request and response context.</param>
         protected override void InvokeAsyncCallback(IAsyncExecutionContext executionContext)
         {
-            // Call InvokeAsync to redirect to new location.
-            if (HandleRedirect(ExecutionContext.CreateFromAsyncContext(executionContext)))
+            // Check for redirect if an exception hasn't occured
+            if (executionContext.ResponseContext.AsyncResult.Exception == null)
             {
-                base.InvokeAsync(executionContext);
-                return;
+                // Check if a redirect is required
+                if (HandleRedirect(ExecutionContext.CreateFromAsyncContext(executionContext)))
+                {
+                    // Call InvokeAsync to redirect to new location.
+                    base.InvokeAsync(executionContext);
+                    return;
+                }
             }
 
             // Not a redirect, call outer callbacks to continue processing response.

diff --git a/sdk/src/Services/CloudSearchDomain/Custom/Internal/ValidationResponseHandler.cs b/sdk/src/Services/CloudSearchDomain/Custom/Internal/ValidationResponseHandler.cs
@@ -54,8 +54,12 @@ public override async System.Threading.Tasks.Task<T> InvokeAsync<T>(IExecutionCo
         /// <param name="executionContext">The execution context, it contains the
         /// request and response context.</param>
         protected override void InvokeAsyncCallback(IAsyncExecutionContext executionContext)
-        {
-            PostInvoke(ExecutionContext.CreateFromAsyncContext(executionContext));
+        {   
+            // Process the response if an exception hasn't occured
+            if (executionContext.ResponseContext.AsyncResult.Exception == null)
+            {
+                PostInvoke(ExecutionContext.CreateFromAsyncContext(executionContext));
+            }
             base.InvokeAsyncCallback(executionContext);
         }
 #endif

diff --git a/sdk/src/Services/EC2/Custom/Internal/AmazonEC2ResponseHandler.cs b/sdk/src/Services/EC2/Custom/Internal/AmazonEC2ResponseHandler.cs
@@ -71,7 +71,11 @@ public override async System.Threading.Tasks.Task<T> InvokeAsync<T>(IExecutionCo
         /// request and response context.</param>
         protected override void InvokeAsyncCallback(IAsyncExecutionContext executionContext)
         {
-            PostInvoke(ExecutionContext.CreateFromAsyncContext(executionContext));
+            // Process the response if an exception hasn't occured
+            if (executionContext.ResponseContext.AsyncResult.Exception == null)
+            {
+                PostInvoke(ExecutionContext.CreateFromAsyncContext(executionContext));
+            }
             base.InvokeAsyncCallback(executionContext);
         }
 #endif

diff --git a/sdk/src/Services/S3/Custom/Internal/AmazonS3ResponseHandler.cs b/sdk/src/Services/S3/Custom/Internal/AmazonS3ResponseHandler.cs
@@ -70,7 +70,11 @@ public override async System.Threading.Tasks.Task<T> InvokeAsync<T>(IExecutionCo
         /// request and response context.</param>
         protected override void InvokeAsyncCallback(IAsyncExecutionContext executionContext)
         {
-            PostInvoke(ExecutionContext.CreateFromAsyncContext(executionContext));
+            // Process the response if an exception hasn't occured
+            if (executionContext.ResponseContext.AsyncResult.Exception == null)
+            {
+                PostInvoke(ExecutionContext.CreateFromAsyncContext(executionContext));
+            }
             base.InvokeAsyncCallback(executionContext);
         }
 #endif

diff --git a/sdk/src/Services/S3/Custom/_bcl/Encryption/Internal/SetupDecryptionHandler.cs b/sdk/src/Services/S3/Custom/_bcl/Encryption/Internal/SetupDecryptionHandler.cs
@@ -76,7 +76,11 @@ public override async System.Threading.Tasks.Task<T> InvokeAsync<T>(IExecutionCo
         /// request and response context.</param>
         protected override void InvokeAsyncCallback(IAsyncExecutionContext executionContext)
         {
-            PostInvoke(ExecutionContext.CreateFromAsyncContext(executionContext));
+            // Process the response if an exception hasn't occured
+            if (executionContext.ResponseContext.AsyncResult.Exception == null)
+            {
+                PostInvoke(ExecutionContext.CreateFromAsyncContext(executionContext));
+            }
             base.InvokeAsyncCallback(executionContext);
         }
 #endif

diff --git a/sdk/src/Services/SQS/Custom/Internal/ValidationResponseHandler.cs b/sdk/src/Services/SQS/Custom/Internal/ValidationResponseHandler.cs
@@ -55,7 +55,11 @@ public override async System.Threading.Tasks.Task<T> InvokeAsync<T>(IExecutionCo
         /// request and response context.</param>
         protected override void InvokeAsyncCallback(IAsyncExecutionContext executionContext)
         {
-            PostInvoke(ExecutionContext.CreateFromAsyncContext(executionContext));
+            // Process the response if an exception hasn't occured
+            if (executionContext.ResponseContext.AsyncResult.Exception == null)
+            {
+                PostInvoke(ExecutionContext.CreateFromAsyncContext(executionContext));
+            }
             base.InvokeAsyncCallback(executionContext);
         }
 #endif

diff --git a/sdk/test/IntegrationTests/Tests/S3/PutObjectTests.cs b/sdk/test/IntegrationTests/Tests/S3/PutObjectTests.cs
@@ -50,6 +50,27 @@ public static void ClassCleanup()
             BaseClean();
         }
 
+#if AWS_APM_API        
+        [TestMethod]
+        [TestCategory("S3")]
+        public void TestAsyncExceptionHandling()
+        {
+                GetObjectRequest request = new GetObjectRequest
+                {
+                    BucketName = "NonExistentBucket",
+                    Key = "NonExistentKey",
+                };
+
+                IAsyncResult result = Client.BeginGetObject(request, null, null);
+
+                var exception = AssertExtensions.ExpectException<AmazonS3Exception>(
+                    () => Client.EndGetObject(result));
+                Assert.AreEqual("NoSuchBucket", exception.ErrorCode);
+                Assert.AreEqual(HttpStatusCode.NotFound, exception.StatusCode);
+        }
+#endif
+
+
         [TestMethod]
         [TestCategory("S3")]
         public void TestPutAndGetWithInvalidExpires()