diff options
author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-09-29 13:18:34 +0200 |
---|---|---|
committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-09-29 13:18:34 +0200 |
commit | 69430e03105ef2081371353f4b8cc104cecbe2d4 (patch) | |
tree | 58391901c395c26813861a0748c3b96e56f10603 /lib/private | |
parent | 3cd82b8918bc59cf37a447b7c24065f0a5b691f4 (diff) | |
parent | b2a528e3039386357929e7fc7889319b9e63d2ee (diff) | |
download | nextcloud-server-69430e03105ef2081371353f4b8cc104cecbe2d4.tar.gz nextcloud-server-69430e03105ef2081371353f4b8cc104cecbe2d4.zip |
Merge pull request #19367 from owncloud/lock-transaction-no-log
remove warning when trying to get a lock while in transaction
Diffstat (limited to 'lib/private')
-rw-r--r-- | lib/private/lock/dblockingprovider.php | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/lib/private/lock/dblockingprovider.php b/lib/private/lock/dblockingprovider.php index a08357a6024..8f017a713c1 100644 --- a/lib/private/lock/dblockingprovider.php +++ b/lib/private/lock/dblockingprovider.php @@ -102,10 +102,6 @@ class DBLockingProvider extends AbstractLockingProvider { * @throws \OCP\Lock\LockedException */ 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(); if ($type === self::LOCK_SHARED) { $result = $this->initLockField($path,1); |