From a01c79852a0771692e8482e7f89cd2b0b0263200 Mon Sep 17 00:00:00 2001 From: "COUNASSE, Emmanuel" Date: Wed, 25 Nov 2015 17:04:05 +0100 Subject: [PATCH 1/2] BugFix.: On IOException treat client as disconnected --- ServerSentEvent4Net/ServerSentEvent.cs | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/ServerSentEvent4Net/ServerSentEvent.cs b/ServerSentEvent4Net/ServerSentEvent.cs index 1bd2f6f..6d296bc 100644 --- a/ServerSentEvent4Net/ServerSentEvent.cs +++ b/ServerSentEvent4Net/ServerSentEvent.cs @@ -192,11 +192,11 @@ public override string ToString() public static bool IsOnlyComment(IMessage msg) { - return String.IsNullOrEmpty(msg.Id) && - String.IsNullOrEmpty(msg.EventType) && - String.IsNullOrEmpty(msg.Data) && - String.IsNullOrEmpty(msg.Retry) && - !String.IsNullOrEmpty(msg.Comment); + return String.IsNullOrEmpty(msg.Id) && + String.IsNullOrEmpty(msg.EventType) && + String.IsNullOrEmpty(msg.Data) && + String.IsNullOrEmpty(msg.Retry) && + !String.IsNullOrEmpty(msg.Comment); } } @@ -232,7 +232,7 @@ public void Send(IMessage msg) StreamWriter.WriteLine(text); StreamWriter.Flush(); - if(!Message.IsOnlyComment(msg)) + if (!Message.IsOnlyComment(msg)) LastMessageId = msg.Id; if (!string.IsNullOrWhiteSpace(msg.Retry)) @@ -249,6 +249,10 @@ public void Send(IMessage msg) { IsConnected = false; } + catch (IOException) + { + IsConnected = false; + } } } } From 436c8c73eb4b470ab754078f6dde347e5dde3af4 Mon Sep 17 00:00:00 2001 From: "COUNASSE, Emmanuel" Date: Thu, 26 Nov 2015 16:14:00 +0100 Subject: [PATCH 2/2] BugFix.: On ObjectDisposedException treat client as disconnected --- ServerSentEvent4Net/ServerSentEvent.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ServerSentEvent4Net/ServerSentEvent.cs b/ServerSentEvent4Net/ServerSentEvent.cs index 6d296bc..7f5cd51 100644 --- a/ServerSentEvent4Net/ServerSentEvent.cs +++ b/ServerSentEvent4Net/ServerSentEvent.cs @@ -253,6 +253,10 @@ public void Send(IMessage msg) { IsConnected = false; } + catch (ObjectDisposedException) + { + IsConnected = false; + } } } }