Merge pull request #30742 from vespa-engine/freva/fix-leaf

Fix domain name leaf label

2 files changed, 2 insertions, 1 deletions

diff --git a/vespajlib/src/main/java/ai/vespa/http/DomainName.java b/vespajlib/src/main/java/ai/vespa/http/DomainName.java
index 51ae9c12036..32917b615fd 100644
--- a/vespajlib/src/main/java/ai/vespa/http/DomainName.java
+++ b/vespajlib/src/main/java/ai/vespa/http/DomainName.java
@@ -33,7 +33,7 @@ public class DomainName extends PatternedStringWrapper<DomainName> {
     }
 
     public String leafLabel() {
-        int offset = value().lastIndexOf('.');
+        int offset = value().indexOf('.');
         return offset == -1 ? value() : value().substring(0, offset);
     }
 
diff --git a/vespajlib/src/test/java/ai/vespa/http/DomainNameTest.java b/vespajlib/src/test/java/ai/vespa/http/DomainNameTest.java
index f3c9b70b7db..a51e77346ff 100644
--- a/vespajlib/src/test/java/ai/vespa/http/DomainNameTest.java
+++ b/vespajlib/src/test/java/ai/vespa/http/DomainNameTest.java
@@ -34,6 +34,7 @@ class DomainNameTest {
 
         assertEquals("foo", DomainName.of("foo").leafLabel());
         assertEquals("foo", DomainName.of("foo.com").leafLabel());
+        assertEquals("foo", DomainName.of("foo.bar.baz.com").leafLabel());
     }
 
 }