diff options
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs index b2f6e13..22c301b 100644 --- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs +++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | |||
| @@ -625,11 +625,10 @@ namespace Flotsam.RegionModules.AssetCache | |||
| 625 | // File.Copy(tempname, filename, true); | 625 | // File.Copy(tempname, filename, true); |
| 626 | // File.Delete(tempname); | 626 | // File.Delete(tempname); |
| 627 | // | 627 | // |
| 628 | // For a brief period, this was done as a separate copy and then temporary file delete operation. | 628 | // For a brief period, this was done as a separate copy and then temporary file delete operation to |
| 629 | // avoid an IOException caused by move if some competing thread had already written the file. | ||
| 629 | // However, this causes exceptions on Windows when other threads attempt to read a file | 630 | // However, this causes exceptions on Windows when other threads attempt to read a file |
| 630 | // which is still being copied. So instead, go back to moving the file and swallowing any IOException | 631 | // which is still being copied. So instead, go back to moving the file and swallow any IOException. |
| 631 | // that occurs because two threads race to cache the same data (and the second fails because the file | ||
| 632 | // already exists). | ||
| 633 | // | 632 | // |
| 634 | // This situation occurs fairly rarely anyway. We assume in this that moves are atomic on the | 633 | // This situation occurs fairly rarely anyway. We assume in this that moves are atomic on the |
| 635 | // filesystem. | 634 | // filesystem. |