From 17e30bac34ea18d257754fa63b448749b977c430 Mon Sep 17 00:00:00 2001 From: Chen Dan Date: Fri, 11 Aug 2023 15:19:37 +0800 Subject: [PATCH] Fix: Enable to add docker instance via socket on mac with apple silicon Use AFUNIXSocket.isSupported() to check the socket support --- .../org/netbeans/modules/docker/api/DockerSupport.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/ide/docker.api/src/org/netbeans/modules/docker/api/DockerSupport.java b/ide/docker.api/src/org/netbeans/modules/docker/api/DockerSupport.java index 1cfb8074d183..0290397d227d 100644 --- a/ide/docker.api/src/org/netbeans/modules/docker/api/DockerSupport.java +++ b/ide/docker.api/src/org/netbeans/modules/docker/api/DockerSupport.java @@ -30,7 +30,7 @@ import java.util.prefs.Preferences; import javax.swing.event.ChangeListener; import org.netbeans.api.annotations.common.NonNull; -import org.openide.util.BaseUtilities; +import org.newsclub.net.unix.AFUNIXSocket; import org.openide.util.ChangeSupport; import org.openide.util.NbPreferences; import org.openide.util.Parameters; @@ -128,12 +128,7 @@ public void removeChangeListener(ChangeListener listener) { } public boolean isSocketSupported() { - if (BaseUtilities.getOperatingSystem() != BaseUtilities.OS_LINUX - && BaseUtilities.getOperatingSystem() != BaseUtilities.OS_MAC) { - return false; - } - String arch = System.getProperty("os.arch"); // NOI18N - return arch != null && (arch.contains("x86") || arch.contains("amd64")); // NOI18N + return AFUNIXSocket.isSupported(); } private boolean isInitialized() {