Issue #6043 - Reimplement UnixSocket support based on Java 16.

Fixed Unix-Domain profile for Windows. Fixed test to make it work on Windows. Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
jetty · Aug 4, 2021 · 48ed2df · 48ed2df
1 parent 82106cf
commit 48ed2df
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/...y-unixdomain-server/src/test/java/org/eclipse/jetty/unixdomain/server/UnixDomainTest.java b/...y-unixdomain-server/src/test/java/org/eclipse/jetty/unixdomain/server/UnixDomainTest.java
@@ -35,6 +35,7 @@
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.handler.AbstractHandler;
+import org.eclipse.jetty.toolchain.test.FS;
 import org.eclipse.jetty.util.component.LifeCycle;
 import org.hamcrest.Matchers;
 import org.junit.jupiter.api.AfterEach;
@@ -212,8 +213,8 @@ public void handle(String target, Request jettyRequest, HttpServletRequest reque
                 }
                 else if ("/v2".equals(target))
                 {
-                    assertThat(toUnixDomainPath(endPoint.getLocalSocketAddress()).toString(), Matchers.equalTo(dstAddr));
-                    assertThat(toUnixDomainPath(endPoint.getRemoteSocketAddress()).toString(), Matchers.equalTo(srcAddr));
+                    assertThat(toUnixDomainPath(endPoint.getLocalSocketAddress()).toString(), Matchers.equalTo(FS.separators(dstAddr)));
+                    assertThat(toUnixDomainPath(endPoint.getRemoteSocketAddress()).toString(), Matchers.equalTo(FS.separators(srcAddr)));
                 }
                 else
                 {

diff --git a/pom.xml b/pom.xml
@@ -1249,7 +1249,7 @@
       <id>unix-domain-windows</id>
       <activation>
         <os>
-          <name>Windows</name>
+          <family>Windows</family>
         </os>
       </activation>
       <properties>