diff options
| author | Sean Dague | 2009-04-23 17:38:08 +0000 |
|---|---|---|
| committer | Sean Dague | 2009-04-23 17:38:08 +0000 |
| commit | 31bded51fb8d2a51d8b97abbd5f8f6e142b09e69 (patch) | |
| tree | 4e9ece8e790aea2fe93be1383d5a26536d49cad1 | |
| parent | From: Alan Webb <alan_webb@us.ibm.com> (diff) | |
| download | opensim-SC_OLD-31bded51fb8d2a51d8b97abbd5f8f6e142b09e69.zip opensim-SC_OLD-31bded51fb8d2a51d8b97abbd5f8f6e142b09e69.tar.gz opensim-SC_OLD-31bded51fb8d2a51d8b97abbd5f8f6e142b09e69.tar.bz2 opensim-SC_OLD-31bded51fb8d2a51d8b97abbd5f8f6e142b09e69.tar.xz | |
based on recent unit test output, put some extra checking in the
RunAssetCache error code
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/Communications/Cache/AssetCache.cs | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs index ad8d625..f214e19 100644 --- a/OpenSim/Framework/Communications/Cache/AssetCache.cs +++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs | |||
| @@ -185,7 +185,15 @@ namespace OpenSim.Framework.Communications.Cache | |||
| 185 | } | 185 | } |
| 186 | catch (Exception e) | 186 | catch (Exception e) |
| 187 | { | 187 | { |
| 188 | m_log.Error("[ASSET CACHE]: " + e.ToString()); | 188 | if (e != null) |
| 189 | { | ||
| 190 | m_log.ErrorFormat("[ASSET CACHE]: {0}", e); | ||
| 191 | } | ||
| 192 | else | ||
| 193 | { | ||
| 194 | // this looks weird, but we've seen this show up as an issue in unit tests, so leave it here until we know why | ||
| 195 | m_log.Error("[ASSET CACHE]: an exception was thrown in RunAssetManager, but is now null. Something is very wrong."); | ||
| 196 | } | ||
| 189 | } | 197 | } |
| 190 | } | 198 | } |
| 191 | } | 199 | } |