OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

minor: remove mono compiler warnings in WebsocketServerHandler.cs

cpu-performance
Justin Clark-Casey (justincc) 2013-06-20 00:54:19 +01:00
parent 085a87060a
commit a33b6eed6d
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
OpenSim/Framework/Servers/HttpServer/WebsocketServerHandler.cs
View File

@ -75,7 +75,7 @@ namespace OpenSim.Framework.Servers.HttpServer
/// <summary> /// <summary>
/// This is a regular HTTP Request... This may be removed in the future. /// This is a regular HTTP Request... This may be removed in the future.
/// </summary> /// </summary>
public event RegularHttpRequestDelegate OnRegularHttpRequest; // public event RegularHttpRequestDelegate OnRegularHttpRequest;
/// <summary> /// <summary>
/// When the upgrade from a HTTP request to a Websocket is completed, this will be fired /// When the upgrade from a HTTP request to a Websocket is completed, this will be fired
@ -304,15 +304,14 @@ namespace OpenSim.Framework.Servers.HttpServer
if (d != null) if (d != null)
d(this, new UpgradeCompletedEventArgs()); d(this, new UpgradeCompletedEventArgs());
} }
catch (IOException fail) catch (IOException)
{ {
Close(string.Empty); Close(string.Empty);
} }
catch (ObjectDisposedException fail) catch (ObjectDisposedException)
{ {
Close(string.Empty); Close(string.Empty);
} }
} }
/// <summary> /// <summary>
@ -414,8 +413,6 @@ namespace OpenSim.Framework.Servers.HttpServer
_socketState.Header = pheader; _socketState.Header = pheader;
} }
if (_socketState.FrameComplete) if (_socketState.FrameComplete)
{ {
ProcessFrame(_socketState); ProcessFrame(_socketState);
@ -424,7 +421,6 @@ namespace OpenSim.Framework.Servers.HttpServer
_socketState.ExpectedBytes = 0; _socketState.ExpectedBytes = 0;
} }
} }
} }
else else
@ -457,8 +453,7 @@ namespace OpenSim.Framework.Servers.HttpServer
_socketState.ReceivedBytes.Clear(); _socketState.ReceivedBytes.Clear();
_socketState.ExpectedBytes = 0; _socketState.ExpectedBytes = 0;
// do some processing // do some processing
} }
} }
} }
if (offset > 0) if (offset > 0)
@ -477,13 +472,12 @@ namespace OpenSim.Framework.Servers.HttpServer
{ {
// We can't read the stream anymore... // We can't read the stream anymore...
} }
} }
catch (IOException fail) catch (IOException)
{ {
Close(string.Empty); Close(string.Empty);
} }
catch (ObjectDisposedException fail) catch (ObjectDisposedException)
{ {
Close(string.Empty); Close(string.Empty);
} }