Dump OpenSim 0.9.0.1 into it's own branch.

1 files changed, 13 insertions, 2 deletions

diff --git a/OpenSim/Services/Connectors/Presence/PresenceServicesConnector.cs b/OpenSim/Services/Connectors/Presence/PresenceServicesConnector.cs
index b7e95c4..89d64ca 100644
--- a/OpenSim/Services/Connectors/Presence/PresenceServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Presence/PresenceServicesConnector.cs
@@ -107,7 +107,7 @@ namespace OpenSim.Services.Connectors
             {
                 string reply = SynchronousRestFormsRequester.MakeRequest("POST",
                         uri,
-                        reqString, 
+                        reqString,
                         m_Auth);
                 if (reply != string.Empty)
                 {
@@ -313,6 +313,17 @@ namespace OpenSim.Services.Connectors
                 {
                     pinfo = new PresenceInfo((Dictionary<string, object>)replyData["result"]);
                 }
+                else
+                {
+                    if (replyData["result"].ToString() == "null")
+                        return null;
+
+                    m_log.DebugFormat("[PRESENCE CONNECTOR]: Invalid reply (result not dictionary) received from presence server when querying for sessionID {0}", sessionID.ToString());
+                }
+            }
+            else
+            {
+                m_log.DebugFormat("[PRESENCE CONNECTOR]: Invalid reply received from presence server when querying for sessionID {0}", sessionID.ToString());
             }
 
             return pinfo;
@@ -355,7 +366,7 @@ namespace OpenSim.Services.Connectors
 
             if (replyData != null)
             {
-                if (replyData.ContainsKey("result") && 
+                if (replyData.ContainsKey("result") &&
                     (replyData["result"].ToString() == "null" || replyData["result"].ToString() == "Failure"))
                 {
                     return new PresenceInfo[0];