From 9af9f648efe5ec3b59d05a453e15cbe975ab24be Mon Sep 17 00:00:00 2001
From: diva
Date: Sun, 21 Dec 2008 02:25:14 +0000
Subject: Small null check in DeregisterHandlers.

---
 OpenSim/Framework/Communications/Capabilities/Caps.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Framework/Communications/Capabilities')

diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index c83c2a6..91acfbe 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -221,9 +221,12 @@ namespace OpenSim.Framework.Communications.Capabilities
         /// <param name="restMethod"></param>
         public void DeregisterHandlers()
         {
-            foreach (string capsName in m_capsHandlers.Caps)
+            if (m_capsHandlers != null)
             {
-                m_capsHandlers.Remove(capsName);
+                foreach (string capsName in m_capsHandlers.Caps)
+                {
+                    m_capsHandlers.Remove(capsName);
+                }
             }
         }
 
-- 
cgit v1.1