[Modify] Polish it

master
sta 7 years ago
parent 93f12714fe
commit 14bbf8a3ad

@ -39,8 +39,6 @@ namespace WebSocketSharp
private byte[] _data; private byte[] _data;
private long _extDataLength; private long _extDataLength;
private long _length; private long _length;
private string _reason;
private bool _reasonSet;
#endregion #endregion
@ -93,12 +91,8 @@ namespace WebSocketSharp
internal PayloadData (ushort code, string reason) internal PayloadData (ushort code, string reason)
{ {
_reason = reason ?? String.Empty;
_data = code.Append (reason); _data = code.Append (reason);
_length = _data.LongLength; _length = _data.LongLength;
_reasonSet = true;
} }
#endregion #endregion
@ -131,24 +125,15 @@ namespace WebSocketSharp
internal string Reason { internal string Reason {
get { get {
if (!_reasonSet) { if (_length <= 2)
if (_length > 2) { return String.Empty;
var raw = _data.SubArray (2, _length - 2);
string reason;
if (!raw.TryGetUTF8DecodedString (out reason))
reason = String.Empty;
_reason = reason;
}
else {
_reason = String.Empty;
}
_reasonSet = true; var raw = _data.SubArray (2, _length - 2);
}
return _reason; string reason;
return raw.TryGetUTF8DecodedString (out reason)
? reason
: String.Empty;
} }
} }

Loading…
Cancel
Save