Fix 1571 : Custom OData Actions do not respect 204 return values

Fixed the null reference exception happens on response.Content.GetType().FullName Fix for both v3 and v4.
aspnet · May 30, 2014 · d252143 · d252143
1 parent 6c741f7
commit d252143
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 2 deletions.
diff --git a/src/System.Web.Http.OData/OData/EnableQueryAttribute.cs b/src/System.Web.Http.OData/OData/EnableQueryAttribute.cs
@@ -376,7 +376,7 @@ public override void OnActionExecuted(HttpActionExecutedContext actionExecutedCo
 
             HttpResponseMessage response = actionExecutedContext.Response;
 
-            if (response != null && response.IsSuccessStatusCode)
+            if (response != null && response.IsSuccessStatusCode && response.Content != null)
             {
                 ObjectContent responseContent = response.Content as ObjectContent;
                 if (responseContent == null)

diff --git a/src/System.Web.OData/OData/EnableQueryAttribute.cs b/src/System.Web.OData/OData/EnableQueryAttribute.cs
@@ -379,7 +379,7 @@ public override void OnActionExecuted(HttpActionExecutedContext actionExecutedCo
 
             HttpResponseMessage response = actionExecutedContext.Response;
 
-            if (response != null && response.IsSuccessStatusCode)
+            if (response != null && response.IsSuccessStatusCode && response.Content != null)
             {
                 ObjectContent responseContent = response.Content as ObjectContent;
                 if (responseContent == null)

diff --git a/test/System.Web.Http.OData.Test/OData/Query/EnableQueryAttributeTest.cs b/test/System.Web.Http.OData.Test/OData/Query/EnableQueryAttributeTest.cs
@@ -369,6 +369,35 @@ public void NonObjectContentResponse_ThrowsArgumentException()
                 "Queries can not be applied to a response content of type 'System.Net.Http.StreamContent'. The response content must be an ObjectContent.");
         }
 
+        [Fact]
+        public void NullContentResponse_DoesNotThrow()
+        {
+            // Arrange
+            EnableQueryAttribute attribute = new EnableQueryAttribute();
+            HttpRequestMessage request = new HttpRequestMessage(HttpMethod.Get, "http://localhost/Customer?$skip=1");
+            HttpConfiguration config = new HttpConfiguration();
+            request.SetConfiguration(config);
+            HttpControllerContext controllerContext = new HttpControllerContext(
+                config,
+                new HttpRouteData(new HttpRoute()),
+                request);
+            HttpControllerDescriptor controllerDescriptor = new HttpControllerDescriptor(
+                new HttpConfiguration(),
+                "CustomerHighLevel",
+                typeof(CustomerHighLevelController));
+            HttpActionDescriptor actionDescriptor = new ReflectedHttpActionDescriptor(
+                controllerDescriptor,
+                typeof(CustomerHighLevelController).GetMethod("GetIEnumerableOfCustomer"));
+            HttpActionContext actionContext = new HttpActionContext(controllerContext, actionDescriptor);
+            HttpActionExecutedContext context = new HttpActionExecutedContext(actionContext, null)
+            {
+                Response = new HttpResponseMessage(HttpStatusCode.OK) { Content = null }
+            };
+
+            // Act & Assert
+            Assert.DoesNotThrow(() => attribute.OnActionExecuted(context));
+        }
+
         [Theory]
         [InlineData("$top=1")]
         [InlineData("$skip=1")]

diff --git a/test/System.Web.OData.Test/OData/Query/EnableQueryAttributeTest.cs b/test/System.Web.OData.Test/OData/Query/EnableQueryAttributeTest.cs
@@ -376,6 +376,35 @@ public void NonObjectContentResponse_ThrowsArgumentException()
                 "Queries can not be applied to a response content of type 'System.Net.Http.StreamContent'. The response content must be an ObjectContent.");
         }
 
+        [Fact]
+        public void NullContentResponse_DoesNotThrow()
+        {
+            // Arrange
+            EnableQueryAttribute attribute = new EnableQueryAttribute();
+            HttpRequestMessage request = new HttpRequestMessage(HttpMethod.Get, "http://localhost/Customer?$skip=1");
+            HttpConfiguration config = new HttpConfiguration();
+            request.SetConfiguration(config);
+            HttpControllerContext controllerContext = new HttpControllerContext(
+                config,
+                new HttpRouteData(new HttpRoute()),
+                request);
+            HttpControllerDescriptor controllerDescriptor = new HttpControllerDescriptor(
+                new HttpConfiguration(),
+                "CustomerHighLevel",
+                typeof(CustomerHighLevelController));
+            HttpActionDescriptor actionDescriptor = new ReflectedHttpActionDescriptor(
+                controllerDescriptor,
+                typeof(CustomerHighLevelController).GetMethod("GetIEnumerableOfCustomer"));
+            HttpActionContext actionContext = new HttpActionContext(controllerContext, actionDescriptor);
+            HttpActionExecutedContext context = new HttpActionExecutedContext(actionContext, null)
+            {
+                Response = new HttpResponseMessage(HttpStatusCode.OK) { Content = null }
+            };
+
+            // Act & Assert
+            Assert.DoesNotThrow(() => attribute.OnActionExecuted(context));
+        }
+
         [Theory]
         [InlineData("$top=1")]
         [InlineData("$skip=1")]