Refactored a few for MessageEventArgs.cs

This commit is contained in:
sta 2015-07-25 16:32:06 +09:00
parent 196f5d92a1
commit 2461b43145

View File

@ -86,7 +86,10 @@ namespace WebSocketSharp
public string Data { public string Data {
get { get {
if (!_dataSet) { if (!_dataSet) {
_data = convertToString (_rawData, _opcode); _data = _opcode != Opcode.Binary
? convertToString (_rawData)
: BitConverter.ToString (_rawData);
_dataSet = true; _dataSet = true;
} }
@ -122,11 +125,8 @@ namespace WebSocketSharp
#region Private Methods #region Private Methods
private static string convertToString (byte[] rawData, Opcode opcode) private static string convertToString (byte[] rawData)
{ {
if (opcode == Opcode.Binary)
return BitConverter.ToString (rawData);
try { try {
return Encoding.UTF8.GetString (rawData); return Encoding.UTF8.GetString (rawData);
} }