From 31bded51fb8d2a51d8b97abbd5f8f6e142b09e69 Mon Sep 17 00:00:00 2001
From: Sean Dague <sean@dague.net>
Date: Thu, 23 Apr 2009 17:38:08 +0000
Subject: [PATCH] based on recent unit test output, put some extra checking in
 the RunAssetCache error code

---
 OpenSim/Framework/Communications/Cache/AssetCache.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs
index ad8d6257f0..f214e191a1 100644
--- a/OpenSim/Framework/Communications/Cache/AssetCache.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs
@@ -185,7 +185,15 @@ namespace OpenSim.Framework.Communications.Cache
                 }
                 catch (Exception e)
                 {
-                    m_log.Error("[ASSET CACHE]: " + e.ToString());
+                    if (e != null) 
+                    {
+                        m_log.ErrorFormat("[ASSET CACHE]: {0}", e);
+                    } 
+                    else 
+                    {
+                        // this looks weird, but we've seen this show up as an issue in unit tests, so leave it here until we know why
+                        m_log.Error("[ASSET CACHE]: an exception was thrown in RunAssetManager, but is now null.  Something is very wrong.");
+                    }
                 }
             }
         }