diff --git a/websocket-sharp/WebSocket.cs b/websocket-sharp/WebSocket.cs index da104d61..8403132c 100644 --- a/websocket-sharp/WebSocket.cs +++ b/websocket-sharp/WebSocket.cs @@ -651,23 +651,20 @@ namespace WebSocketSharp /// public ClientSslConfiguration SslConfiguration { get { - return _client - ? (_sslConfig ?? (_sslConfig = new ClientSslConfiguration (_uri.DnsSafeHost))) - : null; - } + if (!_client) { + var msg = "This instance is not a client."; + throw new InvalidOperationException (msg); + } - set { - lock (_forState) { - string msg; - if (!checkIfAvailable (true, false, true, false, false, true, out msg)) { - _logger.Error (msg); - error ("An error has occurred in setting the ssl configuration.", null); + if (!_secure) { + var msg = "The connection is not secure."; + throw new InvalidOperationException (msg); + } - return; - } + if (_sslConfig == null) + _sslConfig = new ClientSslConfiguration (_uri.DnsSafeHost); - _sslConfig = value; - } + return _sslConfig; } }