sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #22290 from owncloud/dav-upload-scan-in-lock 

scan the file in the write lock when uploading over dav
remotes/origin/users-ajaxloadgroups
Thomas Müller 2016-02-11 14:02:08 +07:00
parent 73e3737777 bef70e9448
commit 26939a2873
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/dav/lib/connector/sabre/file.php
Unescape Escape View File

@ -194,15 +194,15 @@ class File extends Node implements IFile {
}
}
// since we skipped the view we need to scan and emit the hooks ourselves
$storage->getUpdater()->update($internalPath);
try {
$this->changeLock(ILockingProvider::LOCK_SHARED);
} catch (LockedException $e) {
throw new FileLocked($e->getMessage(), $e->getCode(), $e);
}
// since we skipped the view we need to scan and emit the hooks ourselves
$storage->getUpdater()->update($internalPath);
if ($view) {
$this->emitPostHooks($exists);
}
@ -450,11 +450,11 @@ class File extends Node implements IFile {
}
}
$this->fileView->changeLock($targetPath, ILockingProvider::LOCK_SHARED);
// since we skipped the view we need to scan and emit the hooks ourselves
$targetStorage->getUpdater()->update($targetInternalPath);
$this->fileView->changeLock($targetPath, ILockingProvider::LOCK_SHARED);
$this->emitPostHooks($exists, $targetPath);
$info = $this->fileView->getFileInfo($targetPath);