Merge branch 'moses.metricsPhase2' of git.irl.ucf.edu:/irl/git/opensim into moses.metricsPhase2

1 files changed, 5 insertions, 1 deletions

diff --git a/OpenSim/Framework/Monitoring/SimExtraStatsCollector.cs b/OpenSim/Framework/Monitoring/SimExtraStatsCollector.cs
index 432efdb..e4df7ee 100755
--- a/OpenSim/Framework/Monitoring/SimExtraStatsCollector.cs
+++ b/OpenSim/Framework/Monitoring/SimExtraStatsCollector.cs
@@ -433,7 +433,11 @@ Asset service request failures: {3}" + Environment.NewLine,
             foreach (ProcessThread currentThread in
                 Process.GetCurrentProcess().Threads)
             {
-                if (currentThread.ThreadState == ThreadState.Running)
+                // A known issue with the current process .Threads property is 
+                // that it can return null threads, thus don't count those as 
+                // running threads and prevent the program function from failing
+                if (currentThread != null && 
+                    currentThread.ThreadState == ThreadState.Running)
                 {
                     numberThreadsRunning++;
                 }