Merge remote-tracking branch 'remotes/origin/MAGETWO-44058-old' into BugFestW5

Author: aohorodnyk

app/code/Magento/CatalogUrlRewrite/Observer/ProductProcessUrlRewriteSavingObserver.php

@@ -5,6 +5,7 @@
  */
 namespace Magento\CatalogUrlRewrite\Observer;
 
+use Magento\Catalog\Model\Product\Visibility;
 use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
 use Magento\UrlRewrite\Model\UrlPersistInterface;
 use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
@@ -53,7 +54,9 @@ public function execute(\Magento\Framework\Event\Observer $observer)
                     UrlRewrite::ENTITY_TYPE => ProductUrlRewriteGenerator::ENTITY_TYPE,
                 ]);
             }
-            $this->urlPersist->replace($this->productUrlRewriteGenerator->generate($product));
+            if ($product->getVisibility() != Visibility::VISIBILITY_NOT_VISIBLE) {
+                $this->urlPersist->replace($this->productUrlRewriteGenerator->generate($product));
+            }
         }
     }
 }

app/code/Magento/CatalogUrlRewrite/Observer/ProductToWebsiteChangeObserver.php

@@ -72,7 +72,9 @@ public function execute(\Magento\Framework\Event\Observer $observer)
                 UrlRewrite::ENTITY_ID => $product->getId(),
                 UrlRewrite::ENTITY_TYPE => ProductUrlRewriteGenerator::ENTITY_TYPE,
             ]);
-            $this->urlPersist->replace($this->productUrlRewriteGenerator->generate($product));
+            if ($product->getVisibility() != Visibility::VISIBILITY_NOT_VISIBLE) {
+                $this->urlPersist->replace($this->productUrlRewriteGenerator->generate($product));
+            }
         }
     }
 }