aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-10-18 00:39:43 +0100
committerJustin Clark-Casey (justincc)2012-10-18 00:39:43 +0100
commit991151250d070cb3e16d609b0f13e9de751687f1 (patch)
treea4c55506bc9efc3bffbc465f666585b2b62c189f /OpenSim/Framework/Servers
parentminor: Remove event method doc from LLClientView that I forgot in the last co... (diff)
downloadopensim-SC_OLD-991151250d070cb3e16d609b0f13e9de751687f1.zip
opensim-SC_OLD-991151250d070cb3e16d609b0f13e9de751687f1.tar.gz
opensim-SC_OLD-991151250d070cb3e16d609b0f13e9de751687f1.tar.bz2
opensim-SC_OLD-991151250d070cb3e16d609b0f13e9de751687f1.tar.xz
If we're avoiding printing a long request warning for a GetTexture CAP call, check we received a request handler first since this is not guaranteed.
Resolves harmless logged exception when content type and generic xml rpc requests take more than 3 seconds.
Diffstat (limited to 'OpenSim/Framework/Servers')
-rw-r--r--OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index d5bc3c3..b018e57 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -648,7 +648,7 @@ namespace OpenSim.Framework.Servers.HttpServer
648 // Every month or so this will wrap and give bad numbers, not really a problem 648 // Every month or so this will wrap and give bad numbers, not really a problem
649 // since its just for reporting 649 // since its just for reporting
650 int tickdiff = requestEndTick - requestStartTick; 650 int tickdiff = requestEndTick - requestStartTick;
651 if (tickdiff > 3000 && requestHandler.Name != "GetTexture") 651 if (tickdiff > 3000 && requestHandler != null && requestHandler.Name != "GetTexture")
652 { 652 {
653 m_log.InfoFormat( 653 m_log.InfoFormat(
654 "[BASE HTTP SERVER]: Slow handling of {0} {1} {2} {3} {4} from {5} took {6}ms", 654 "[BASE HTTP SERVER]: Slow handling of {0} {1} {2} {3} {4} from {5} took {6}ms",