From 697b46a600fe9307610bd3fdae5cd59d025cbdc4 Mon Sep 17 00:00:00 2001 From: sta Date: Wed, 30 Oct 2019 21:20:44 +0900 Subject: [PATCH] [Modify] Polish it --- websocket-sharp/Net/HttpListenerResponse.cs | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/websocket-sharp/Net/HttpListenerResponse.cs b/websocket-sharp/Net/HttpListenerResponse.cs index fc0254ba..67826211 100644 --- a/websocket-sharp/Net/HttpListenerResponse.cs +++ b/websocket-sharp/Net/HttpListenerResponse.cs @@ -540,14 +540,28 @@ namespace WebSocketSharp.Net } set { - checkDisposedOrHeadersSent (); + if (_disposed) + throw new ObjectDisposedException (GetType ().ToString ()); + + if (_headersSent) { + var msg = "The response is already being sent."; + throw new InvalidOperationException (msg); + } + if (value == null || value.Length == 0) { _statusDescription = _statusCode.GetStatusDescription (); return; } - if (!value.IsText () || value.IndexOfAny (new[] { '\r', '\n' }) > -1) - throw new ArgumentException ("Contains invalid characters.", "value"); + if (!value.IsText ()) { + var msg = "It contains invalid characters."; + throw new ArgumentException (msg, "value"); + } + + if (value.IndexOfAny (new[] { '\r', '\n' }) > -1) { + var msg = "It contains invalid characters."; + throw new ArgumentException (msg, "value"); + } _statusDescription = value; }