From 4f7acc4c2c70cf07ad1ce7f4c304ba5edea98105 Mon Sep 17 00:00:00 2001 From: Melanie Thielker Date: Mon, 18 Aug 2014 17:14:51 +0200 Subject: [PATCH] Expect a missing directory, the asset cache is shared. Prevent spew if two nodes run cleanup at the same time. --- OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs index b270de9c89..5468cdc87c 100644 --- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs +++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs @@ -588,6 +588,11 @@ namespace OpenSim.Region.CoreModules.Asset dir, dirSize); } } + catch (DirectoryNotFoundException) + { + // If we get here, another node on the same box has + // already removed the directory. Continue with next. + } catch (Exception e) { m_log.Warn(