From 663cb7afa75c1272ffda9c39ed226801954d54da Mon Sep 17 00:00:00 2001 From: Ryan Schmitt Date: Sat, 5 Jul 2025 00:07:21 -0700 Subject: [PATCH] Jep380SocketChannelAdapter: Connect in blocking mode This fixes UDS integration test failures on Windows and Java 17+. --- .../hc/client5/http/socket/Jep380SocketChannelAdapter.java | 2 ++ .../hc/client5/http/socket/Jep380SocketChannelImplAdapter.java | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/socket/Jep380SocketChannelAdapter.java b/httpclient5/src/main/java/org/apache/hc/client5/http/socket/Jep380SocketChannelAdapter.java index b124e6bb14..487f13490b 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/socket/Jep380SocketChannelAdapter.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/socket/Jep380SocketChannelAdapter.java @@ -51,11 +51,13 @@ private Jep380SocketChannelAdapter(final SocketChannel channel, final Jep380Sock @Override public void connect(final SocketAddress endpoint, final int timeout) throws IOException { channel.connect(endpoint); + channel.configureBlocking(false); } @Override public void connect(final SocketAddress endpoint) throws IOException { channel.connect(endpoint); + channel.configureBlocking(false); } @Override diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/socket/Jep380SocketChannelImplAdapter.java b/httpclient5/src/main/java/org/apache/hc/client5/http/socket/Jep380SocketChannelImplAdapter.java index c35a491dd7..1d4875f91b 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/socket/Jep380SocketChannelImplAdapter.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/socket/Jep380SocketChannelImplAdapter.java @@ -49,7 +49,6 @@ final class Jep380SocketChannelImplAdapter extends SocketImpl { public Jep380SocketChannelImplAdapter(final SocketChannel channel) throws IOException { this.channel = channel; - channel.configureBlocking(false); } @Override