Merge pull request #6458 from nextcloud/rethrow-correct-exception

Rethrow the correct exception when there was an error in an app conta…

1 files changed, 10 insertions, 3 deletions

diff --git a/lib/private/AppFramework/DependencyInjection/DIContainer.php b/lib/private/AppFramework/DependencyInjection/DIContainer.php
index 78400d8082e..e33ffdca96c 100644
--- a/lib/private/AppFramework/DependencyInjection/DIContainer.php
+++ b/lib/private/AppFramework/DependencyInjection/DIContainer.php
@@ -412,8 +412,15 @@ class DIContainer extends SimpleContainer implements IAppContainer {
 	public function query($name) {
 		try {
 			return $this->queryNoFallback($name);
-		} catch (QueryException $e) {
-			return $this->getServer()->query($name);
+		} catch (QueryException $firstException) {
+			try {
+				return $this->getServer()->query($name);
+			} catch (QueryException $secondException) {
+				if ($firstException->getCode() === 1) {
+					throw $secondException;
+				}
+				throw $firstException;
+			}
 		}
 	}
 
@@ -438,6 +445,6 @@ class DIContainer extends SimpleContainer implements IAppContainer {
 		}
 
 		throw new QueryException('Could not resolve ' . $name . '!' .
-			' Class can not be instantiated');
+			' Class can not be instantiated', 1);
 	}
 }