PWA-3221::PWA Upward connector throws exception

Author: glo82145

Model/PageType.php

@@ -197,13 +197,11 @@ private function findFinalUrl(string $requestPath, int $storeId, bool $findCusto
         $urlRewrite = $this->findUrlFromRequestPath($requestPath, $storeId);
         if ($urlRewrite) {
             $this->redirectType = $urlRewrite->getRedirectType();
-            if($urlRewrite->getRedirectType() > 0) {
-                while ($urlRewrite && $urlRewrite->getRedirectType() > 0) {
-                    $urlRewrite = $this->findUrlFromRequestPath($urlRewrite->getTargetPath(), $storeId);
-                }
-            } else {
-                $urlRewrite = $this->findUrlFromTargetPath($requestPath, $storeId);
+            while ($urlRewrite && $urlRewrite->getRedirectType() > 0) {
+                $urlRewrite = $this->findUrlFromRequestPath($urlRewrite->getTargetPath(), $storeId);
             }
+        } else {
+            $urlRewrite = $this->findUrlFromTargetPath($requestPath, $storeId);
         }
         if ($urlRewrite && ($findCustom && !$urlRewrite->getEntityId() && !$urlRewrite->getIsAutogenerated())) {
             $urlRewrite = $this->findUrlFromTargetPath($urlRewrite->getTargetPath(), $storeId);