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

Removed a constructor from the WebSocket class

Browse Source
This commit is contained in:
sta 2014-01-05 03:38:40 +09:00
parent b054784489
commit e7d3a2bb17
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
websocket-sharp/WebSocket.cs
View File

@ -105,26 +105,10 @@ namespace WebSocketSharp
#endregion #endregion
#region Private Constructors
private WebSocket ()
{
_compression = CompressionMethod.NONE;
_cookies = new CookieCollection ();
_extensions = String.Empty;
_forClose = new object ();
_forSend = new object ();
_protocol = String.Empty;
_readyState = WebSocketState.CONNECTING;
}
#endregion
#region Internal Constructors #region Internal Constructors
// As server // As server
internal WebSocket (HttpListenerWebSocketContext context, Logger logger) internal WebSocket (HttpListenerWebSocketContext context, Logger logger)
: this ()
{ {
_context = context; _context = context;
_logger = logger; _logger = logger;
@ -133,11 +117,12 @@ namespace WebSocketSharp
_secure = context.IsSecureConnection; _secure = context.IsSecureConnection;
_stream = context.Stream; _stream = context.Stream;
_uri = context.RequestUri; _uri = context.RequestUri;
init ();
} }
// As server // As server
internal WebSocket (TcpListenerWebSocketContext context, Logger logger) internal WebSocket (TcpListenerWebSocketContext context, Logger logger)
: this ()
{ {
_context = context; _context = context;
_logger = logger; _logger = logger;
@ -146,6 +131,8 @@ namespace WebSocketSharp
_secure = context.IsSecureConnection; _secure = context.IsSecureConnection;
_stream = context.Stream; _stream = context.Stream;
_uri = context.RequestUri; _uri = context.RequestUri;
init ();
} }
#endregion #endregion
@ -170,7 +157,6 @@ namespace WebSocketSharp
/// <paramref name="url"/> is <see langword="null"/>. /// <paramref name="url"/> is <see langword="null"/>.
/// </exception> /// </exception>
public WebSocket (string url, params string [] protocols) public WebSocket (string url, params string [] protocols)
: this ()
{ {
if (url == null) if (url == null)
throw new ArgumentNullException ("url"); throw new ArgumentNullException ("url");
@ -185,6 +171,8 @@ namespace WebSocketSharp
_client = true; _client = true;
_logger = new Logger (); _logger = new Logger ();
_secure = _uri.Scheme == "wss"; _secure = _uri.Scheme == "wss";
init ();
} }
#endregion #endregion
@ -810,6 +798,17 @@ namespace WebSocketSharp
OnError.Emit (this, new ErrorEventArgs (message)); OnError.Emit (this, new ErrorEventArgs (message));
} }
private void init ()
{
_compression = CompressionMethod.NONE;
_cookies = new CookieCollection ();
_extensions = String.Empty;
_forClose = new object ();
_forSend = new object ();
_protocol = String.Empty;
_readyState = WebSocketState.CONNECTING;
}
private void open () private void open ()
{ {
_readyState = WebSocketState.OPEN; _readyState = WebSocketState.OPEN;