From 889bb44b425417c3a63a269b060a7bc7e112bc38 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Sat, 7 Nov 2020 17:51:41 +0100 Subject: [PATCH] First query the server container When the servercontainer wants to obtain something changes are very high this is something from the server container. Esp on setups with a lot of shares this can change quite a bit as it avoid a needless check on the strpos OCA\\ etc. Signed-off-by: Roeland Jago Douma --- lib/private/ServerContainer.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/private/ServerContainer.php b/lib/private/ServerContainer.php index 72275ac120..50592f36ad 100644 --- a/lib/private/ServerContainer.php +++ b/lib/private/ServerContainer.php @@ -133,6 +133,12 @@ class ServerContainer extends SimpleContainer { public function query(string $name, bool $autoload = true) { $name = $this->sanitizeName($name); + try { + return parent::query($name, false); + } catch (QueryException $e) { + // Continue with general autoloading then + } + // In case the service starts with OCA\ we try to find the service in // the apps container first. if (($appContainer = $this->getAppContainerForService($name)) !== null) {