Merge pull request #19367 from owncloud/lock-transaction-no-log
remove warning when trying to get a lock while in transaction
This commit is contained in:
commit
69430e0310
|
@ -102,10 +102,6 @@ class DBLockingProvider extends AbstractLockingProvider {
|
||||||
* @throws \OCP\Lock\LockedException
|
* @throws \OCP\Lock\LockedException
|
||||||
*/
|
*/
|
||||||
public function acquireLock($path, $type) {
|
public function acquireLock($path, $type) {
|
||||||
if ($this->connection->inTransaction()) {
|
|
||||||
$this->logger->warning("Trying to acquire a lock for '$path' while inside a transition");
|
|
||||||
}
|
|
||||||
|
|
||||||
$expire = $this->getExpireTime();
|
$expire = $this->getExpireTime();
|
||||||
if ($type === self::LOCK_SHARED) {
|
if ($type === self::LOCK_SHARED) {
|
||||||
$result = $this->initLockField($path,1);
|
$result = $this->initLockField($path,1);
|
||||||
|
|
Loading…
Reference in New Issue