From 824a4b480873721a4a10598299b185b602e1931d Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 12 Jun 2013 23:47:47 +0100
Subject: After calls to GetSuitcaseXFolder() in HGSuitcaseInventoryService,
 consistently check for null return and log warning rather than throw
 exception.

This was being done already in some places.
If an exception is thrown it is now an error rather than debug
---
 .../HypergridService/HGSuitcaseInventoryService.cs | 24 +++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs')

diff --git a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
index eecf757..410916f 100644
--- a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
+++ b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
@@ -115,6 +115,12 @@ namespace OpenSim.Services.HypergridService
         {
             XInventoryFolder suitcase = GetSuitcaseXFolder(principalID);
 
+            if (suitcase == null)
+            {
+                m_log.WarnFormat("[HG SUITCASE INVENTORY SERVICE]: Found no suitcase folder for user {0} when looking for inventory skeleton", principalID);
+                return null;
+            }
+
             List<XInventoryFolder> tree = GetFolderTree(principalID, suitcase.folderID);
             if (tree == null || (tree != null && tree.Count == 0))
                 return null;
@@ -134,6 +140,7 @@ namespace OpenSim.Services.HypergridService
         public override InventoryCollection GetUserInventory(UUID userID)
         {
             m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: Get Suitcase inventory for user {0}", userID);
+
             InventoryCollection userInventory = new InventoryCollection();
             userInventory.UserID = userID;
             userInventory.Folders = new List<InventoryFolderBase>();
@@ -141,6 +148,12 @@ namespace OpenSim.Services.HypergridService
 
             XInventoryFolder suitcase = GetSuitcaseXFolder(userID);
 
+            if (suitcase == null)
+            {
+                m_log.WarnFormat("[HG SUITCASE INVENTORY SERVICE]: Found no suitcase folder for user {0} when looking for user inventory", userID);
+                return null;
+            }
+
             List<XInventoryFolder> tree = GetFolderTree(userID, suitcase.folderID);
             if (tree == null || (tree != null && tree.Count == 0))
             {
@@ -182,7 +195,8 @@ namespace OpenSim.Services.HypergridService
             m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: GetRootFolder for {0}", principalID);
 
             // Let's find out the local root folder
-            XInventoryFolder root = GetRootXFolder(principalID); ;
+            XInventoryFolder root = GetRootXFolder(principalID);
+
             if (root == null)
             {
                 m_log.WarnFormat("[HG SUITCASE INVENTORY SERVICE]: Unable to retrieve local root folder for user {0}", principalID);
@@ -255,6 +269,13 @@ namespace OpenSim.Services.HypergridService
         {
             //m_log.DebugFormat("[HG INVENTORY SERVICE]: GetFolderForType for {0} {0}", principalID, type);
             XInventoryFolder suitcase = GetSuitcaseXFolder(principalID);
+
+            if (suitcase == null)
+            {
+                m_log.WarnFormat("[HG SUITCASE INVENTORY SERVICE]: Found no suitcase folder for user {0} when looking for child type folder {1}", principalID, type);
+                return null;
+            }
+
             XInventoryFolder[] folders = m_Database.GetFolders(
                     new string[] { "agentID", "type", "parentFolderID" },
                     new string[] { principalID.ToString(), ((int)type).ToString(), suitcase.folderID.ToString() });
@@ -546,6 +567,7 @@ namespace OpenSim.Services.HypergridService
         private bool IsWithinSuitcaseTree(UUID principalID, UUID folderID)
         {
             XInventoryFolder suitcase = GetSuitcaseXFolder(principalID);
+
             if (suitcase == null)
             {
                 m_log.WarnFormat("[HG SUITCASE INVENTORY SERVICE]: User {0} does not have a Suitcase folder", principalID);
-- 
cgit v1.1