aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorJulius Härtl <jus@bitgrid.net>2023-06-06 08:41:08 +0200
committerGitHub <noreply@github.com>2023-06-06 08:41:08 +0200
commit3846ec2899d476c03765859487bce4a8ccd0e799 (patch)
tree10fd824c9106c41ac1ac0bd878e49ab0c8b0ec4c /lib
parent958096aed4b55dc76272d1b071a0a03b6487cc45 (diff)
parent6f43ab82fd244cb60a26512b646e575efbde6b28 (diff)
downloadnextcloud-server-3846ec2899d476c03765859487bce4a8ccd0e799.tar.gz
nextcloud-server-3846ec2899d476c03765859487bce4a8ccd0e799.zip
Merge pull request #38322 from nextcloud/bugfix/noid/throw-early-app-container
Diffstat (limited to 'lib')
-rw-r--r--lib/private/ServerContainer.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/private/ServerContainer.php b/lib/private/ServerContainer.php
index a8583bd6875..daa480a75d1 100644
--- a/lib/private/ServerContainer.php
+++ b/lib/private/ServerContainer.php
@@ -154,8 +154,10 @@ class ServerContainer extends SimpleContainer {
try {
return $appContainer->queryNoFallback($name);
} catch (QueryException $e) {
- // Didn't find the service or the respective app container,
- // ignore it and fall back to the core container.
+ // Didn't find the service or the respective app container
+ // In this case the service won't be part of the core container,
+ // so we can throw directly
+ throw $e;
}
} elseif (str_starts_with($name, 'OC\\Settings\\') && substr_count($name, '\\') >= 3) {
$segments = explode('\\', $name);