Skip to content

Commit 62a848f

Browse files
committed
Register JNA's native library integration in LinuxSocketDomain
See gh-19836
1 parent ef13f04 commit 62a848f

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
import java.util.List;
2323

2424
import com.sun.jna.LastErrorException;
25+
import com.sun.jna.Native;
26+
import com.sun.jna.Platform;
2527
import com.sun.jna.Structure;
2628

2729
import org.springframework.util.Assert;
@@ -33,6 +35,10 @@
3335
*/
3436
class LinuxDomainSocket extends DomainSocket {
3537

38+
static {
39+
Native.register(Platform.C_LIBRARY_NAME);
40+
}
41+
3642
LinuxDomainSocket(String path) throws IOException {
3743
super(path);
3844
}

spring-boot-project/spring-boot-tools/spring-boot-cloudnativebuildpack/src/test/java/org/springframework/boot/cloudnativebuildpack/docker/DockerApiIntegrationTests.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
import java.io.IOException;
2020

2121
import org.junit.jupiter.api.Test;
22-
import org.junit.jupiter.api.condition.DisabledOnOs;
23-
import org.junit.jupiter.api.condition.OS;
2422

2523
import org.springframework.boot.cloudnativebuildpack.docker.type.ImageReference;
2624
import org.springframework.boot.testsupport.testcontainers.DisabledIfDockerUnavailable;
@@ -31,7 +29,6 @@
3129
* @author Phillip Webb
3230
*/
3331
@DisabledIfDockerUnavailable
34-
@DisabledOnOs(OS.LINUX)
3532
class DockerApiIntegrationTests {
3633

3734
private final DockerApi docker = new DockerApi();

0 commit comments

Comments
 (0)