log a warning while trying to acquire a db lock from within a transaction

1 files changed, 4 insertions, 4 deletions

diff --git a/lib/private/server.php b/lib/private/server.php
index 51e70405432..be2cfc2cf88 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -432,10 +432,10 @@ class Server extends SimpleContainer implements IServerContainer {
 				/** @var \OC\Memcache\Factory $memcacheFactory */
 				$memcacheFactory = $c->getMemCacheFactory();
 				$memcache = $memcacheFactory->createLocking('lock');
-				if (!($memcache instanceof \OC\Memcache\NullCache)) {
-					return new MemcacheLockingProvider($memcache);
-				}
-				return new DBLockingProvider($c->getDatabaseConnection());
+//				if (!($memcache instanceof \OC\Memcache\NullCache)) {
+//					return new MemcacheLockingProvider($memcache);
+//				}
+				return new DBLockingProvider($c->getDatabaseConnection(), $c->getLogger());
 			}
 			return new NoopLockingProvider();
 		});