Merge pull request #165 from nextras/pr/persistence_helper_improvements

Pr/persistence helper improvements
nextras · Mar 15, 2016 · 40582c4 · 40582c4
2 parents 0f347b4 + 5205e20
commit 40582c4
Showing 1 changed file with 15 additions and 12 deletions.
diff --git a/src/Repository/PersistenceHelper.php b/src/Repository/PersistenceHelper.php
@@ -36,21 +36,24 @@ class PersistenceHelper
 	 */
 	public static function getCascadeQueue(IEntity $entity, IModel $model, $withCascade)
 	{
-		self::$inputQueue = [];
-		self::$outputQueue = [];
-		self::visitEntity($entity, $model, $withCascade);
+		try {
+			self::visitEntity($entity, $model, $withCascade);
+
+			for ($i = 0; $i < count(self::$inputQueue); $i++) {
+				$value = self::$inputQueue[$i];
+				if ($value instanceof IEntity) {
+					self::visitEntity($value, $model);
+				} else {
+					self::visitRelationship($value, $model);
+				}
+			}
 
-		for ($i = 0; $i < count(self::$inputQueue); $i++) {
-			$value = self::$inputQueue[$i];
+			return self::$outputQueue;
 
-			if ($value instanceof IEntity) {
-				self::visitEntity($value, $model);
-			} else {
-				self::visitRelationship($value, $model);
-			}
+		} finally {
+			self::$inputQueue = [];
+			self::$outputQueue = [];
 		}
-
-		return self::$outputQueue;
 	}