Merge pull request #21 from magento-commerce/PWA-3124

Error occurs when Runtime exception is thrown in vendor/magento/modul…

Author: glo82145

Model/PageType.php

@@ -8,6 +8,7 @@
 
 namespace Magento\UpwardConnector\Model;
 
+use Magento\Framework\Exception\RuntimeException;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\UrlRewrite\Model\UrlFinderInterface;
 use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
@@ -110,7 +111,7 @@ public function getContext(): ?Context
     public function resolvePageInfo(): ?array
     {
         if (!$this->getContext()) {
-            throw new \RuntimeException('UPWARD Context not set');
+            throw new RuntimeException(__('UPWARD Context not set'));
         }
 
         $storeId = (int) $this->storeManager->getStore()->getId();
@@ -144,7 +145,7 @@ public function resolvePageInfo(): ?array
             }
 
             if (empty($resultArray['id'])) {
-                throw new \RuntimeException(
+                throw new RuntimeException(
                     __('No such entity found with matching URL key: %url', ['url' => $url])
                 );
             }
@@ -196,11 +197,13 @@ private function findFinalUrl(string $requestPath, int $storeId, bool $findCusto
         $urlRewrite = $this->findUrlFromRequestPath($requestPath, $storeId);
         if ($urlRewrite) {
             $this->redirectType = $urlRewrite->getRedirectType();
-            while ($urlRewrite && $urlRewrite->getRedirectType() > 0) {
-                $urlRewrite = $this->findUrlFromRequestPath($urlRewrite->getTargetPath(), $storeId);
+            if($urlRewrite->getRedirectType() > 0) {
+                while ($urlRewrite && $urlRewrite->getRedirectType() > 0) {
+                    $urlRewrite = $this->findUrlFromRequestPath($urlRewrite->getTargetPath(), $storeId);
+                }
+            } else {
+                $urlRewrite = $this->findUrlFromTargetPath($requestPath, $storeId);
             }
-        } else {
-            $urlRewrite = $this->findUrlFromTargetPath($requestPath, $storeId);
         }
         if ($urlRewrite && ($findCustom && !$urlRewrite->getEntityId() && !$urlRewrite->getIsAutogenerated())) {
             $urlRewrite = $this->findUrlFromTargetPath($urlRewrite->getTargetPath(), $storeId);