Merge pull request #32 from LykkeCity/NoContentFilter

Fixed NoContentFilter to properly process OkObjectResult
LykkeCity · May 6, 2019 · be4cdd2 · be4cdd2
2 parents 34b887b + 92e024e
commit be4cdd2
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/src/Lykke.Common.ApiLibrary/Filters/NoContentFilter.cs b/src/Lykke.Common.ApiLibrary/Filters/NoContentFilter.cs
@@ -2,6 +2,7 @@
 using JetBrains.Annotations;
 using Lykke.Common.Log;
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
 
 namespace Lykke.Common.ApiLibrary.Filters
@@ -28,10 +29,14 @@ public void OnResultExecuted(ResultExecutedContext context)
             var response = context.HttpContext.Response;
             if (response.StatusCode == StatusCodes.Status200OK && (response.ContentLength ?? 0) == 0)
             {
-                if (response.HasStarted)
-                    _log.Warning($"Couldn't set NoContent into response to {context.HttpContext.Request.Method} {context.HttpContext.Request.Path}");
-                else
-                    response.StatusCode = StatusCodes.Status204NoContent;
+                var okResult = context.Result as OkObjectResult;
+                if (okResult?.Value == null)
+                {
+                    if (response.HasStarted)
+                        _log.Warning($"Couldn't set NoContent into response to {context.HttpContext.Request.Method} {context.HttpContext.Request.Path}");
+                    else
+                        response.StatusCode = StatusCodes.Status204NoContent;
+                }
             }
         }
     }