Clean up withReadPreference handling

doctrine · Apr 27, 2018 · 859565b · 859565b
1 parent d7dcc75
commit 859565b
Showing 1 changed file with 4 additions and 11 deletions.
diff --git a/lib/Doctrine/MongoDB/Query/Query.php b/lib/Doctrine/MongoDB/Query/Query.php
@@ -481,17 +481,10 @@ private function withReadPreference($object, \Closure $closure)
         $object->setReadPreference($this->query['readPreference'], $this->query['readPreferenceTags']);
 
         try {
-            $result = $closure();
-        } catch (\Exception $e) {
-        }
-
-        $prevTags = ! empty($prevReadPref['tagsets']) ? $prevReadPref['tagsets'] : null;
-        $object->setReadPreference($prevReadPref['type'], $prevTags);
-
-        if (isset($e)) {
-            throw $e;
+            return $closure();
+        } finally {
+            $prevTags = ! empty($prevReadPref['tagsets']) ? $prevReadPref['tagsets'] : [];
+            $object->setReadPreference($prevReadPref['type'], $prevTags);
         }
-
-        return $result;
     }
 }