[Modify] Polish it
This commit is contained in:
parent
8bddc2e2c4
commit
f1741f912b
@ -117,7 +117,8 @@ namespace WebSocketSharp.Net
|
|||||||
#region Public Methods
|
#region Public Methods
|
||||||
|
|
||||||
public override IAsyncResult BeginRead (
|
public override IAsyncResult BeginRead (
|
||||||
byte[] buffer, int offset, int count, AsyncCallback callback, object state)
|
byte[] buffer, int offset, int count, AsyncCallback callback, object state
|
||||||
|
)
|
||||||
{
|
{
|
||||||
if (_disposed)
|
if (_disposed)
|
||||||
throw new ObjectDisposedException (GetType ().ToString ());
|
throw new ObjectDisposedException (GetType ().ToString ());
|
||||||
@ -132,21 +133,27 @@ namespace WebSocketSharp.Net
|
|||||||
throw new ArgumentOutOfRangeException ("count", "A negative value.");
|
throw new ArgumentOutOfRangeException ("count", "A negative value.");
|
||||||
|
|
||||||
var len = buffer.Length;
|
var len = buffer.Length;
|
||||||
if (offset + count > len)
|
|
||||||
throw new ArgumentException (
|
if (offset + count > len) {
|
||||||
"The sum of 'offset' and 'count' is greater than 'buffer' length.");
|
var msg = "The sum of 'offset' and 'count' is greater than the length of 'buffer'.";
|
||||||
|
|
||||||
|
throw new ArgumentException (msg);
|
||||||
|
}
|
||||||
|
|
||||||
var ares = new HttpStreamAsyncResult (callback, state);
|
var ares = new HttpStreamAsyncResult (callback, state);
|
||||||
|
|
||||||
if (_noMoreData) {
|
if (_noMoreData) {
|
||||||
ares.Complete ();
|
ares.Complete ();
|
||||||
|
|
||||||
return ares;
|
return ares;
|
||||||
}
|
}
|
||||||
|
|
||||||
var nread = _decoder.Read (buffer, offset, count);
|
var nread = _decoder.Read (buffer, offset, count);
|
||||||
|
|
||||||
offset += nread;
|
offset += nread;
|
||||||
count -= nread;
|
count -= nread;
|
||||||
|
|
||||||
if (count == 0) {
|
if (count == 0) {
|
||||||
// Got all we wanted, no need to bother the decoder yet.
|
|
||||||
ares.Count = nread;
|
ares.Count = nread;
|
||||||
ares.Complete ();
|
ares.Complete ();
|
||||||
|
|
||||||
@ -155,6 +162,7 @@ namespace WebSocketSharp.Net
|
|||||||
|
|
||||||
if (!_decoder.WantMore) {
|
if (!_decoder.WantMore) {
|
||||||
_noMoreData = nread == 0;
|
_noMoreData = nread == 0;
|
||||||
|
|
||||||
ares.Count = nread;
|
ares.Count = nread;
|
||||||
ares.Complete ();
|
ares.Complete ();
|
||||||
|
|
||||||
@ -167,6 +175,7 @@ namespace WebSocketSharp.Net
|
|||||||
|
|
||||||
var rstate = new ReadBufferState (buffer, offset, count, ares);
|
var rstate = new ReadBufferState (buffer, offset, count, ares);
|
||||||
rstate.InitialCount += nread;
|
rstate.InitialCount += nread;
|
||||||
|
|
||||||
base.BeginRead (ares.Buffer, ares.Offset, ares.Count, onRead, rstate);
|
base.BeginRead (ares.Buffer, ares.Offset, ares.Count, onRead, rstate);
|
||||||
|
|
||||||
return ares;
|
return ares;
|
||||||
|
Loading…
Reference in New Issue
Block a user