Skip to content

Commit 267956c

Browse files
Replace JNI domain sockets implementation with one that uses JDK support
Closes gh-41050
1 parent 6d2ebc0 commit 267956c

File tree

5 files changed

+104
-366
lines changed

5 files changed

+104
-366
lines changed

spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/transport/LocalHttpClientTransport.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@
4040
import org.apache.hc.core5.util.TimeValue;
4141

4242
import org.springframework.boot.buildpack.platform.docker.configuration.ResolvedDockerHost;
43-
import org.springframework.boot.buildpack.platform.socket.DomainSocket;
4443
import org.springframework.boot.buildpack.platform.socket.NamedPipeSocket;
44+
import org.springframework.boot.buildpack.platform.socket.UnixDomainSocket;
4545

4646
/**
4747
* {@link HttpClientTransport} that talks to local Docker.
@@ -129,7 +129,7 @@ public Socket createSocket(HttpContext context) throws IOException {
129129
if (this.host.startsWith(NPIPE_PREFIX)) {
130130
return NamedPipeSocket.get(this.host.substring(NPIPE_PREFIX.length()));
131131
}
132-
return (!Platform.isWindows()) ? DomainSocket.get(this.host) : NamedPipeSocket.get(this.host);
132+
return (!Platform.isWindows()) ? UnixDomainSocket.get(this.host) : NamedPipeSocket.get(this.host);
133133
}
134134

135135
@Override

spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/socket/BsdDomainSocket.java

Lines changed: 0 additions & 83 deletions
This file was deleted.

spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/socket/DomainSocket.java

Lines changed: 0 additions & 201 deletions
This file was deleted.

spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/socket/LinuxDomainSocket.java

Lines changed: 0 additions & 80 deletions
This file was deleted.

0 commit comments

Comments
 (0)