diff options
author | Vincent Petry <pvince81@owncloud.com> | 2015-07-01 09:30:18 +0200 |
---|---|---|
committer | Vincent Petry <pvince81@owncloud.com> | 2015-07-01 09:47:05 +0200 |
commit | fd4efdded9d0dfbccfbeb15dfe40022e07174f3c (patch) | |
tree | 07ded44d244673257066bc5ce83cecabcdcfb251 /lib | |
parent | b5c9196ffcf8f5300d96e7d2bdd78f2695f6fd7a (diff) | |
download | nextcloud-server-fd4efdded9d0dfbccfbeb15dfe40022e07174f3c.tar.gz nextcloud-server-fd4efdded9d0dfbccfbeb15dfe40022e07174f3c.zip |
Clean up part file only once, not twice on error
Diffstat (limited to 'lib')
-rw-r--r-- | lib/private/connector/sabre/file.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/connector/sabre/file.php b/lib/private/connector/sabre/file.php index 93244bea6ff..c28ac584998 100644 --- a/lib/private/connector/sabre/file.php +++ b/lib/private/connector/sabre/file.php @@ -189,7 +189,6 @@ class File extends Node implements IFile { } if (!$run || $renameOkay === false || $fileExists === false) { \OC_Log::write('webdav', 'renaming part file to final file failed', \OC_Log::ERROR); - $partStorage->unlink($internalPartPath); throw new Exception('Could not rename part file to final file'); } } catch (\Exception $e) { @@ -350,6 +349,7 @@ class File extends Node implements IFile { if ($chunk_handler->isComplete()) { list($storage,) = $this->fileView->resolvePath($path); $needsPartFile = $this->needsPartFile($storage); + $partFile = null; try { $targetPath = $path . '/' . $info['name']; @@ -388,7 +388,7 @@ class File extends Node implements IFile { $info = $this->fileView->getFileInfo($targetPath); return $info->getEtag(); } catch (\Exception $e) { - if ($partFile) { + if ($partFile !== null) { $this->fileView->unlink($partFile); } $this->convertToSabreException($e); |