diff options
author | Diva Canto | 2013-07-15 11:37:49 -0700 |
---|---|---|
committer | Diva Canto | 2013-07-15 11:37:49 -0700 |
commit | fbb01bd28064cde3e00ddf2a0cc4ce87ddd4cb6e (patch) | |
tree | 1f8ed1bd08fd85e1cac979d550f1400bbc42d1e8 /OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs | |
parent | Trying to hunt the CPU spikes recently experienced. (diff) | |
download | opensim-SC_OLD-fbb01bd28064cde3e00ddf2a0cc4ce87ddd4cb6e.zip opensim-SC_OLD-fbb01bd28064cde3e00ddf2a0cc4ce87ddd4cb6e.tar.gz opensim-SC_OLD-fbb01bd28064cde3e00ddf2a0cc4ce87ddd4cb6e.tar.bz2 opensim-SC_OLD-fbb01bd28064cde3e00ddf2a0cc4ce87ddd4cb6e.tar.xz |
Protect against null requests
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs index a528093..507329e 100644 --- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs +++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs | |||
@@ -681,17 +681,19 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement | |||
681 | Watchdog.UpdateThread(); | 681 | Watchdog.UpdateThread(); |
682 | 682 | ||
683 | NameRequest request = m_RequestQueue.Dequeue(); | 683 | NameRequest request = m_RequestQueue.Dequeue(); |
684 | string[] names; | 684 | if (request != null) |
685 | bool foundRealName = TryGetUserNames(request.uuid, out names); | ||
686 | |||
687 | if (names.Length == 2) | ||
688 | { | 685 | { |
689 | if (!foundRealName) | 686 | string[] names; |
690 | m_log.DebugFormat("[USER MANAGEMENT MODULE]: Sending {0} {1} for {2} to {3} since no bound name found", names[0], names[1], request.uuid, request.client.Name); | 687 | bool foundRealName = TryGetUserNames(request.uuid, out names); |
691 | 688 | ||
692 | request.client.SendNameReply(request.uuid, names[0], names[1]); | 689 | if (names.Length == 2) |
693 | } | 690 | { |
691 | if (!foundRealName) | ||
692 | m_log.DebugFormat("[USER MANAGEMENT MODULE]: Sending {0} {1} for {2} to {3} since no bound name found", names[0], names[1], request.uuid, request.client.Name); | ||
694 | 693 | ||
694 | request.client.SendNameReply(request.uuid, names[0], names[1]); | ||
695 | } | ||
696 | } | ||
695 | } | 697 | } |
696 | } | 698 | } |
697 | 699 | ||