DevWiki/websocket-sharp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed the checkIfAvailable (bool, bool) method

Browse Source
This commit is contained in:
sta 2015-09-04 11:35:50 +09:00
parent c87acb5029
commit de8f4caffa
1 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
websocket-sharp/WebSocket.cs
View File

@ -289,7 +289,7 @@ namespace WebSocketSharp
set { set {
lock (_forConn) { lock (_forConn) {
var msg = checkIfAvailable (false, false); var msg = checkIfAvailable (true, false, true, false, false, true);
if (msg != null) { if (msg != null) {
_logger.Error (msg); _logger.Error (msg);
error ("An error has occurred in setting the compression.", null); error ("An error has occurred in setting the compression.", null);
@ -364,7 +364,7 @@ namespace WebSocketSharp
set { set {
lock (_forConn) { lock (_forConn) {
var msg = checkIfAvailable (false, false); var msg = checkIfAvailable (true, false, true, false, false, true);
if (msg != null) { if (msg != null) {
_logger.Error (msg); _logger.Error (msg);
error ("An error has occurred in setting the enable redirection.", null); error ("An error has occurred in setting the enable redirection.", null);
@ -460,7 +460,7 @@ namespace WebSocketSharp
set { set {
lock (_forConn) { lock (_forConn) {
var msg = checkIfAvailable (false, false); var msg = checkIfAvailable (true, false, true, false, false, true);
if (msg == null) { if (msg == null) {
if (value.IsNullOrEmpty ()) { if (value.IsNullOrEmpty ()) {
_origin = value; _origin = value;
@ -532,7 +532,7 @@ namespace WebSocketSharp
set { set {
lock (_forConn) { lock (_forConn) {
var msg = checkIfAvailable (false, false); var msg = checkIfAvailable (true, false, true, false, false, true);
if (msg != null) { if (msg != null) {
_logger.Error (msg); _logger.Error (msg);
error ("An error has occurred in setting the ssl configuration.", null); error ("An error has occurred in setting the ssl configuration.", null);
@ -572,7 +572,9 @@ namespace WebSocketSharp
set { set {
lock (_forConn) { lock (_forConn) {
var msg = checkIfAvailable (true, false) ?? value.CheckIfValidWaitTime (); var msg = checkIfAvailable (true, true, true, false, false, true) ??
value.CheckIfValidWaitTime ();
if (msg != null) { if (msg != null) {
_logger.Error (msg); _logger.Error (msg);
error ("An error has occurred in setting the wait time.", null); error ("An error has occurred in setting the wait time.", null);
@ -667,15 +669,6 @@ namespace WebSocketSharp
return sendHttpResponse (createHandshakeResponse ()); return sendHttpResponse (createHandshakeResponse ());
} }
private string checkIfAvailable (bool server, bool connected)
{
return !server && !_client
? "This operation isn't available in the server."
: !connected && IsConnected
? "This operation isn't available in: " + _readyState
: null;
}
private string checkIfAvailable ( private string checkIfAvailable (
bool client, bool server, bool connecting, bool open, bool closing, bool closed) bool client, bool server, bool connecting, bool open, bool closing, bool closed)
{ {
@ -2487,7 +2480,9 @@ namespace WebSocketSharp
public void SetCookie (Cookie cookie) public void SetCookie (Cookie cookie)
{ {
lock (_forConn) { lock (_forConn) {
var msg = checkIfAvailable (false, false) ?? (cookie == null ? "'cookie' is null." : null); var msg = checkIfAvailable (true, false, true, false, false, true) ??
(cookie == null ? "'cookie' is null." : null);
if (msg != null) { if (msg != null) {
_logger.Error (msg); _logger.Error (msg);
error ("An error has occurred in setting the cookie.", null); error ("An error has occurred in setting the cookie.", null);
@ -2518,7 +2513,7 @@ namespace WebSocketSharp
public void SetCredentials (string username, string password, bool preAuth) public void SetCredentials (string username, string password, bool preAuth)
{ {
lock (_forConn) { lock (_forConn) {
var msg = checkIfAvailable (false, false); var msg = checkIfAvailable (true, false, true, false, false, true);
if (msg == null) { if (msg == null) {
if (username.IsNullOrEmpty ()) { if (username.IsNullOrEmpty ()) {
_credentials = null; _credentials = null;
@ -2565,7 +2560,7 @@ namespace WebSocketSharp
public void SetProxy (string url, string username, string password) public void SetProxy (string url, string username, string password)
{ {
lock (_forConn) { lock (_forConn) {
var msg = checkIfAvailable (false, false); var msg = checkIfAvailable (true, false, true, false, false, true);
if (msg == null) { if (msg == null) {
if (url.IsNullOrEmpty ()) { if (url.IsNullOrEmpty ()) {
_proxyUri = null; _proxyUri = null;