Merge remote-tracking branch 'origin/AC-14269' into spartans_pr_03092025

Author: glo60612

app/code/Magento/UrlRewriteGraphQl/Model/Resolver/AbstractEntityUrl.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -136,8 +136,11 @@ private function findFinalUrl(UrlRewrite $urlRewrite): UrlRewrite
                 $urlRewrite->getTargetPath(),
                 (int) $urlRewrite->getStoreId()
             );
-            if ($nextUrlRewrite) {
+
+            if ($nextUrlRewrite && $nextUrlRewrite->getTargetPath() !== $urlRewrite->getTargetPath()) {
                 $urlRewrite = $nextUrlRewrite;
+            } else {
+                $nextUrlRewrite = null;
             }
         } while ($nextUrlRewrite);