diff options
| author | UbitUmarov | 2017-05-26 00:34:04 +0100 |
|---|---|---|
| committer | UbitUmarov | 2017-05-26 00:34:46 +0100 |
| commit | 8d8236cfb245eaa25f81f2840175b8fe676febbd (patch) | |
| tree | fbc55a7ad5ac579ae88a8f0b3a4e75d0c156f8cf /OpenSim/Framework | |
| parent | change wrong watchdog stopped thread check code, and don't log it (diff) | |
| download | opensim-SC_OLD-8d8236cfb245eaa25f81f2840175b8fe676febbd.zip opensim-SC_OLD-8d8236cfb245eaa25f81f2840175b8fe676febbd.tar.gz opensim-SC_OLD-8d8236cfb245eaa25f81f2840175b8fe676febbd.tar.bz2 opensim-SC_OLD-8d8236cfb245eaa25f81f2840175b8fe676febbd.tar.xz | |
missing file change.. actually use watchdog threads on assetsconnector and
avoid null refs on JobEngine
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/Monitoring/JobEngine.cs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Framework/Monitoring/JobEngine.cs b/OpenSim/Framework/Monitoring/JobEngine.cs index 0a39e4b..a6a059d 100644 --- a/OpenSim/Framework/Monitoring/JobEngine.cs +++ b/OpenSim/Framework/Monitoring/JobEngine.cs | |||
| @@ -136,12 +136,15 @@ namespace OpenSim.Framework.Monitoring | |||
| 136 | if(m_jobQueue.Count <= 0) | 136 | if(m_jobQueue.Count <= 0) |
| 137 | m_cancelSource.Cancel(); | 137 | m_cancelSource.Cancel(); |
| 138 | 138 | ||
| 139 | if(m_finishedProcessingAfterStop.WaitOne(RequestProcessTimeoutOnStop)) | 139 | m_finishedProcessingAfterStop.WaitOne(RequestProcessTimeoutOnStop); |
| 140 | m_finishedProcessingAfterStop.Close(); | 140 | m_finishedProcessingAfterStop.Close(); |
| 141 | } | 141 | } |
| 142 | finally | 142 | finally |
| 143 | { | 143 | { |
| 144 | m_cancelSource.Dispose(); | 144 | if(m_cancelSource != null) |
| 145 | m_cancelSource.Dispose(); | ||
| 146 | if(m_finishedProcessingAfterStop != null) | ||
| 147 | m_finishedProcessingAfterStop.Dispose(); | ||
| 145 | } | 148 | } |
| 146 | } | 149 | } |
| 147 | } | 150 | } |