don't move files in cache twice, fixes renaming for objectstores

owncloud · Sep 30, 2015 · 2575f64 · 2575f64
1 parent 6760969
commit 2575f64
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/lib/private/files/cache/updater.php b/lib/private/files/cache/updater.php
@@ -171,13 +171,15 @@ public function rename($source, $target) {
 
  if ($sourceStorage && $targetStorage) {
  $targetCache = $targetStorage->getCache($sourceInternalPath);
- if ($targetCache->inCache($targetInternalPath)) {
- $targetCache->remove($targetInternalPath);
- }
- if ($sourceStorage === $targetStorage) {
- $targetCache->move($sourceInternalPath, $targetInternalPath);
- } else {
- $targetCache->moveFromCache($sourceStorage->getCache(), $sourceInternalPath, $targetInternalPath);
+ if ($sourceStorage->getCache($sourceInternalPath)->inCache($sourceInternalPath)) {
+ if ($targetCache->inCache($targetInternalPath)) {
+ $targetCache->remove($targetInternalPath);
+ }
+ if ($sourceStorage === $targetStorage) {
+ $targetCache->move($sourceInternalPath, $targetInternalPath);
+ } else {
+ $targetCache->moveFromCache($sourceStorage->getCache(), $sourceInternalPath, $targetInternalPath);
+ }
  }
 
  if (pathinfo($sourceInternalPath, PATHINFO_EXTENSION) !== pathinfo($targetInternalPath, PATHINFO_EXTENSION)) {