diff options
author | Steven Zielinski | 2015-05-04 10:40:36 -0400 |
---|---|---|
committer | Steven Zielinski | 2015-05-04 13:17:11 -0400 |
commit | 96a86e7d5a4a4f0d712522190a1ff19fc44aac80 (patch) | |
tree | 288e8968ab2e4e1fd931ac3e056df1c2ffa94f35 /OpenSim/Framework/Monitoring/SimExtraStatsCollector.cs | |
parent | Fixed vocabulary in a comment to match the code. (diff) | |
download | opensim-SC_OLD-96a86e7d5a4a4f0d712522190a1ff19fc44aac80.zip opensim-SC_OLD-96a86e7d5a4a4f0d712522190a1ff19fc44aac80.tar.gz opensim-SC_OLD-96a86e7d5a4a4f0d712522190a1ff19fc44aac80.tar.bz2 opensim-SC_OLD-96a86e7d5a4a4f0d712522190a1ff19fc44aac80.tar.xz |
Fixed a bug that would cause the sim extra stats reporter to fail in reporting stats. The bug was caused by the current process threads which can return null references.
Test Plan: Tested on windows using opensim standalone and the json stats.
Reviewers: rlouden, ssirigam, clattin, martin, kboswell
Reviewed By: rlouden, ssirigam, clattin, martin, kboswell
Differential Revision: http://cr.irl.ucf.edu/D277
Diffstat (limited to '')
-rwxr-xr-x | OpenSim/Framework/Monitoring/SimExtraStatsCollector.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Monitoring/SimExtraStatsCollector.cs b/OpenSim/Framework/Monitoring/SimExtraStatsCollector.cs index 3791fff..e4df7ee 100755 --- a/OpenSim/Framework/Monitoring/SimExtraStatsCollector.cs +++ b/OpenSim/Framework/Monitoring/SimExtraStatsCollector.cs | |||
@@ -433,7 +433,7 @@ Asset service request failures: {3}" + Environment.NewLine, | |||
433 | foreach (ProcessThread currentThread in | 433 | foreach (ProcessThread currentThread in |
434 | Process.GetCurrentProcess().Threads) | 434 | Process.GetCurrentProcess().Threads) |
435 | { | 435 | { |
436 | // A known issue with the current process .threads property is | 436 | // A known issue with the current process .Threads property is |
437 | // that it can return null threads, thus don't count those as | 437 | // that it can return null threads, thus don't count those as |
438 | // running threads and prevent the program function from failing | 438 | // running threads and prevent the program function from failing |
439 | if (currentThread != null && | 439 | if (currentThread != null && |