Catch throwables in mview updating

magento · Jul 15, 2019 · 7ffb199 · 7ffb199
1 parent 5a17bf3
commit 7ffb199
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/lib/internal/Magento/Framework/Mview/View.php b/lib/internal/Magento/Framework/Mview/View.php
@@ -299,12 +299,19 @@ public function update()
                     ? View\StateInterface::STATUS_SUSPENDED
                     : View\StateInterface::STATUS_IDLE;
                 $this->getState()->setVersionId($currentVersionId)->setStatus($statusToRestore)->save();
-            } catch (\Exception $exception) {
+            } catch (\Throwable $exception) {
                 $this->getState()->loadByView($this->getId());
                 $statusToRestore = $this->getState()->getStatus() == View\StateInterface::STATUS_SUSPENDED
                     ? View\StateInterface::STATUS_SUSPENDED
                     : View\StateInterface::STATUS_IDLE;
                 $this->getState()->setStatus($statusToRestore)->save();
+                if (!$exception instanceof \Exception) {
+                    $exception = new \RuntimeException(
+                        'Error when updating an mview',
+                        0,
+                        $exception
+                    );
+                }
                 throw $exception;
             }
         }