Issue #3432120: Domain URI uripath Causing Double Slashes

src/Entity/Domain.php

@@ -612,8 +612,9 @@ class Domain extends ContentEntityBase implements DomainInterface {
     if (!$this->isDefaultPort()) {
       $uri .= ':' . $this->get('port')->value;
     }
-    if (!empty($this->get('uripath')->value)) {
-      $uri .= '/' . trim($this->get('uripath')->value, '/');
+    $uripath = trim($this->get('uripath')->value, '/');
+    if (!empty($uripath)) {
+      $uri .= '/' . $uripath;
     }
     if ($this->cleanUrl && !empty($query)) {
       $uri .= '/' . $query;