Merge pull request #452 from LuccaSA/bugfix-writer-disposed

Avoid writer to be disposed
LuccaSA · Jul 28, 2020 · 5e25800 · 5e25800
2 parents 5d5916a + 6cefbcc
commit 5e25800
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Rdd.Web/Serialization/RddJsonResult.cs b/src/Rdd.Web/Serialization/RddJsonResult.cs
@@ -50,7 +50,7 @@ public RddJsonResult(ISelection<T> value, IExpressionTree<T> fields)
             Fields = fields;
         }
 
-        public override Task ExecuteResultAsync(ActionContext context)
+        public override async Task ExecuteResultAsync(ActionContext context)
         {
             if (context == null)
             {
@@ -70,7 +70,7 @@ public override Task ExecuteResultAsync(ActionContext context)
             var services = context.HttpContext.RequestServices;
             using (var writer = services.GetRequiredService<IHttpResponseStreamWriterFactory>().CreateWriter(response.Body, resolvedContentTypeEncoding))
             {
-                return WriteResult(services, writer, DateTime.Now);
+                await WriteResultAsync(services, writer, DateTime.Now);
             }
         }
 
@@ -90,7 +90,7 @@ private string GetPrincipalName(IServiceProvider services)
             return name.Value;
         }
 
-        internal async Task WriteResult(IServiceProvider services, TextWriter writer, DateTime generatedAt)
+        internal async Task WriteResultAsync(IServiceProvider services, TextWriter writer, DateTime generatedAt)
         {
             Value = new Metadata(Value, GetPrincipalName(services), generatedAt);
 

diff --git a/test/Rdd.Web.Tests/Serialization/FieldsTests.cs b/test/Rdd.Web.Tests/Serialization/FieldsTests.cs
@@ -83,7 +83,7 @@ protected async Task<string> SerializeCorrectedFieldsAsync<T>(RddJsonResult<T> r
         {
             using (var writer = new StringWriter())
             {
-                await result.WriteResult(GetServices(), writer, GeneratedAt);
+                await result.WriteResultAsync(GetServices(), writer, GeneratedAt);
 
                 return writer.ToString();
             }