diff options
| author | Melanie | 2012-09-16 16:42:30 +0200 |
|---|---|---|
| committer | Melanie | 2012-09-16 16:42:30 +0200 |
| commit | a97436f2f16c2ef217963545349149cdbf9c21b8 (patch) | |
| tree | 4095958a52633ea4733a8272d63f573618dcf8de /OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |
| parent | Sequence/throttle asset retrievals. (diff) | |
| download | opensim-SC_OLD-a97436f2f16c2ef217963545349149cdbf9c21b8.zip opensim-SC_OLD-a97436f2f16c2ef217963545349149cdbf9c21b8.tar.gz opensim-SC_OLD-a97436f2f16c2ef217963545349149cdbf9c21b8.tar.bz2 opensim-SC_OLD-a97436f2f16c2ef217963545349149cdbf9c21b8.tar.xz | |
Catch a nullref in the code to suppress GetTexture warnign spam we can't
do a thing about anyway.
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs')
| -rw-r--r-- | OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index 11852eb..2582b7b 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |||
| @@ -640,7 +640,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 640 | // Every month or so this will wrap and give bad numbers, not really a problem | 640 | // Every month or so this will wrap and give bad numbers, not really a problem |
| 641 | // since its just for reporting | 641 | // since its just for reporting |
| 642 | int tickdiff = requestEndTick - requestStartTick; | 642 | int tickdiff = requestEndTick - requestStartTick; |
| 643 | if (tickdiff > 3000 && requestHandler.Name != "GetTexture") | 643 | if (tickdiff > 3000 && (requestHandler == null || requestHandler.Name == null || requestHandler.Name != "GetTexture")) |
| 644 | { | 644 | { |
| 645 | m_log.InfoFormat( | 645 | m_log.InfoFormat( |
| 646 | "[BASE HTTP SERVER]: Slow handling of {0} {1} {2} {3} from {4} took {5}ms", | 646 | "[BASE HTTP SERVER]: Slow handling of {0} {1} {2} {3} from {4} took {5}ms", |