zervo/seb-win-refactoring
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SEBWIN-405: Fixed issue with parsing of server instruction.

Browse source
This commit is contained in:
Damian Büchel 2020-08-01 19:31:27 +02:00
parent 09fbc6579a
commit 43bdfbb411
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
SafeExamBrowser.Server/ServerProxy.cs
View file

@ -315,9 +315,12 @@ namespace SafeExamBrowser.Server
var token = ("SEBConnectionToken", connectionToken); var token = ("SEBConnectionToken", connectionToken);
var success = TryExecute(HttpMethod.Post, api.PingEndpoint, out var response, content, contentType, authorization, token); var success = TryExecute(HttpMethod.Post, api.PingEndpoint, out var response, content, contentType, authorization, token);
if (success && TryParseInstruction(response.Content, out var instruction) && instruction == "SEB_QUIT") if (success)
{ {
Task.Run(() => TerminationRequested?.Invoke()); if (TryParseInstruction(response.Content, out var instruction) && instruction == "SEB_QUIT")
{
Task.Run(() => TerminationRequested?.Invoke());
}
} }
else else
{ {
@ -445,7 +448,10 @@ namespace SafeExamBrowser.Server
{ {
var json = JsonConvert.DeserializeObject(Extract(content)) as JObject; var json = JsonConvert.DeserializeObject(Extract(content)) as JObject;
instruction = json["instruction"].Value<string>(); if (json != default(JObject))
{
instruction = json["instruction"].Value<string>();
}
} }
catch (Exception e) catch (Exception e)
{ {