diff options
| author | Adam Frisby | 2008-10-10 14:46:01 +0000 |
|---|---|---|
| committer | Adam Frisby | 2008-10-10 14:46:01 +0000 |
| commit | 596366324a27924b8e5af1507da7ec46625dcce2 (patch) | |
| tree | 0f0942edd3d7e6fc3dd598f7ff1be3dfa939131c | |
| parent | * Fixed a potential threading issue with EventQueueGet leading to spontaneous... (diff) | |
| download | opensim-SC_OLD-596366324a27924b8e5af1507da7ec46625dcce2.zip opensim-SC_OLD-596366324a27924b8e5af1507da7ec46625dcce2.tar.gz opensim-SC_OLD-596366324a27924b8e5af1507da7ec46625dcce2.tar.bz2 opensim-SC_OLD-596366324a27924b8e5af1507da7ec46625dcce2.tar.xz | |
* Added NullReference check to EventQueueGetModule.
| -rw-r--r-- | OpenSim/Region/Environment/Modules/Framework/EventQueueGetModule.cs | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Modules/Framework/EventQueueGetModule.cs b/OpenSim/Region/Environment/Modules/Framework/EventQueueGetModule.cs index 5f20dc1..d0e78f1 100644 --- a/OpenSim/Region/Environment/Modules/Framework/EventQueueGetModule.cs +++ b/OpenSim/Region/Environment/Modules/Framework/EventQueueGetModule.cs | |||
| @@ -149,8 +149,14 @@ namespace OpenSim.Region.Environment.Modules.Framework | |||
| 149 | public bool Enqueue(LLSD ev, UUID avatarID) | 149 | public bool Enqueue(LLSD ev, UUID avatarID) |
| 150 | { | 150 | { |
| 151 | m_log.DebugFormat("[EVENTQUEUE]: Enqueuing event for {0} in region {1}", avatarID, m_scene.RegionInfo.RegionName); | 151 | m_log.DebugFormat("[EVENTQUEUE]: Enqueuing event for {0} in region {1}", avatarID, m_scene.RegionInfo.RegionName); |
| 152 | BlockingLLSDQueue queue = GetQueue(avatarID); | 152 | try |
| 153 | queue.Enqueue(ev); | 153 | { |
| 154 | BlockingLLSDQueue queue = GetQueue(avatarID); | ||
| 155 | queue.Enqueue(ev); | ||
| 156 | } catch(NullReferenceException) | ||
| 157 | { | ||
| 158 | return false; | ||
| 159 | } | ||
| 154 | return true; | 160 | return true; |
| 155 | } | 161 | } |
| 156 | #endregion | 162 | #endregion |