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

add soem try/catch (and yes..yes right on last commit should hed been write...

master
UbitUmarov 2020-04-27 16:40:54 +01:00
parent 0518b397a3
commit fa844d7e6e
2 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
OpenSim/Framework/Servers/HttpServer/SimpleOSDMapHandler.cs
View File

@ -117,10 +117,18 @@ namespace OpenSim.Framework.Servers.HttpServer
return; return;
} }
} }
if(m_processRequest != null) try
m_processRequest(httpRequest, httpResponse, args); {
else if(m_processRequest != null)
ProcessRequest(httpRequest, httpResponse, args); m_processRequest(httpRequest, httpResponse, args);
else
ProcessRequest(httpRequest, httpResponse, args);
}
catch
{
httpResponse.StatusCode = (int)HttpStatusCode.InternalServerError;
}
RequestsHandled++; RequestsHandled++;
} }

17
OpenSim/Framework/Servers/HttpServer/SimpleStreamHandler.cs
View File

@ -88,10 +88,19 @@ namespace OpenSim.Framework.Servers.HttpServer
return; return;
} }
} }
if(m_processRequest != null)
m_processRequest(httpRequest, httpResponse); try
else {
ProcessRequest(httpRequest, httpResponse); if (m_processRequest != null)
m_processRequest(httpRequest, httpResponse);
else
ProcessRequest(httpRequest, httpResponse);
}
catch
{
httpResponse.StatusCode = (int)HttpStatusCode.InternalServerError;
}
RequestsHandled++; RequestsHandled++;
} }