#517 final test fail with STJ now passing!

tmenier · Jun 3, 2022 · b081ce3 · b081ce3
1 parent ac6b55e
commit b081ce3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/Test/Flurl.Test/Http/TestingTests.cs b/Test/Flurl.Test/Http/TestingTests.cs
@@ -427,12 +427,12 @@ public async Task can_fake_cookies() {
 		// https://github.com/tmenier/Flurl/issues/175
 		[Test]
 		public async Task can_deserialize_default_response_more_than_once() {
-			var resp = await "http://www.api.com".GetJsonAsync();
+			var resp = await "http://www.api.com".GetJsonAsync<object>();
 			Assert.IsNull(resp);
 			// bug: couldn't deserialize here due to reading stream twice
-			resp = await "http://www.api.com".GetJsonAsync();
+			resp = await "http://www.api.com".GetJsonAsync<object>();
 			Assert.IsNull(resp);
-			resp = await "http://www.api.com".GetJsonAsync();
+			resp = await "http://www.api.com".GetJsonAsync<object>();
 			Assert.IsNull(resp);
 		}
 

diff --git a/src/Flurl.Http/Configuration/DefaultJsonSerializer.cs b/src/Flurl.Http/Configuration/DefaultJsonSerializer.cs
@@ -1,4 +1,5 @@
 using System.IO;
+using System.Security.Cryptography;
 using System.Text.Json;
 
 namespace Flurl.Http.Configuration
@@ -29,12 +30,12 @@ public DefaultJsonSerializer(JsonSerializerOptions options = null) {
 		/// Deserializes the specified JSON string to an object of type T.
 		/// </summary>
 		/// <param name="s">The JSON string to deserialize.</param>
-		public T Deserialize<T>(string s) => JsonSerializer.Deserialize<T>(s, _options);
+		public T Deserialize<T>(string s) => string.IsNullOrWhiteSpace(s) ? default : JsonSerializer.Deserialize<T>(s, _options);
 
 		/// <summary>
 		/// Deserializes the specified stream to an object of type T.
 		/// </summary>
 		/// <param name="stream">The stream to deserialize.</param>
-		public T Deserialize<T>(Stream stream) => JsonSerializer.Deserialize<T>(stream, _options);
+		public T Deserialize<T>(Stream stream) => stream.Length == 0 ? default : JsonSerializer.Deserialize<T>(stream, _options);
 	}
 }