alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-03 06:18:28 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge pull request #3984 from crobibero/json-prerelease

Browse Source 
Use Prerelease System.Text.Json
This commit is contained in:
Bond-009
2020-08-26 18:59:46 +02:00
committed by GitHub
parent 4e3f26b647 de4cfa2234
commit 4f6c98b325
19 changed files with 42 additions and 437 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Emby.Server.Implementations/Data/SqliteItemRepository.cs
View File

@@ -90,9 +90,6 @@ namespace Emby.Server.Implementations.Data
_typeMapper = new TypeMapper();
_jsonOptions = JsonDefaults.GetOptions();
// GetItem throws NotSupportedException with this enabled, so hardcode false.
_jsonOptions.IgnoreNullValues = false;
DbFilePath = Path.Combine(_config.ApplicationPaths.DataPath, "library.db");
}

8
Emby.Server.Implementations/HttpServer/WebSocketConnection.cs
View File

@@ -179,7 +179,7 @@ namespace Emby.Server.Implementations.HttpServer
return;
}
WebSocketMessage<object> stub;
WebSocketMessage<object>? stub;
try
{
@@ -209,6 +209,12 @@ namespace Emby.Server.Implementations.HttpServer
return;
}
if (stub == null)
{
_logger.LogError("Error processing web socket message");
return;
}
// Tell the PipeReader how much of the buffer we have consumed
reader.AdvanceTo(buffer.End);