aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2015-02-04 00:10:13 +0000
committerJustin Clark-Casey (justincc)2015-02-04 00:10:44 +0000
commit68343938215a438cd446a7db819a4f7d93ccacd4 (patch)
tree215391ee6a93b6e4a36c260f5ae31bcf950331d5
parentIf the owner of an object is taking a copy from the scene (e.g. via the "take... (diff)
downloadopensim-SC-68343938215a438cd446a7db819a4f7d93ccacd4.zip
opensim-SC-68343938215a438cd446a7db819a4f7d93ccacd4.tar.gz
opensim-SC-68343938215a438cd446a7db819a4f7d93ccacd4.tar.bz2
opensim-SC-68343938215a438cd446a7db819a4f7d93ccacd4.tar.xz
Fix bug in JobEngine where an attempt to restart after stop would trigger an exception because the cancellation source was not recreated.
-rw-r--r--OpenSim/Framework/Monitoring/JobEngine.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Framework/Monitoring/JobEngine.cs b/OpenSim/Framework/Monitoring/JobEngine.cs
index 44f5d9a..a32e4aa 100644
--- a/OpenSim/Framework/Monitoring/JobEngine.cs
+++ b/OpenSim/Framework/Monitoring/JobEngine.cs
@@ -78,7 +78,7 @@ namespace OpenSim.Framework.Monitoring
78 78
79 private BlockingCollection<Job> m_jobQueue; 79 private BlockingCollection<Job> m_jobQueue;
80 80
81 private CancellationTokenSource m_cancelSource = new CancellationTokenSource(); 81 private CancellationTokenSource m_cancelSource;
82 82
83 /// <summary> 83 /// <summary>
84 /// Used to signal that we are ready to complete stop. 84 /// Used to signal that we are ready to complete stop.
@@ -105,6 +105,7 @@ namespace OpenSim.Framework.Monitoring
105 m_finishedProcessingAfterStop.Reset(); 105 m_finishedProcessingAfterStop.Reset();
106 106
107 m_jobQueue = new BlockingCollection<Job>(new ConcurrentQueue<Job>(), 5000); 107 m_jobQueue = new BlockingCollection<Job>(new ConcurrentQueue<Job>(), 5000);
108 m_cancelSource = new CancellationTokenSource();
108 109
109 WorkManager.StartThread( 110 WorkManager.StartThread(
110 ProcessRequests, 111 ProcessRequests,