3
0
Mirror von https://github.com/IntellectualSites/FastAsyncWorldEdit.git synchronisiert 2024-11-03 01:50:07 +01:00

Merge pull request #384 from xCykrix/1.15

Correct JVM Architecture Detection
Dieser Commit ist enthalten in:
Josh Knight 2020-03-29 19:33:37 -04:00 committet von GitHub
Commit 5f3d6cdc79
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 4AEE18F83AFDEB23

Datei anzeigen

@ -353,10 +353,10 @@ public class Fawe {
debug("==============================================="); debug("===============================================");
} }
} }
String arch = System.getenv("PROCESSOR_ARCHITECTURE");
String wow64Arch = System.getenv("PROCESSOR_ARCHITEW6432"); // Check Base OS Arch for Mismatching Architectures
boolean x86OS = arch == null ? true : !(arch.endsWith("64") || wow64Arch != null && wow64Arch.endsWith("64")); boolean x86OS = System.getProperty("sun.arch.data.model").contains("32");
boolean x86JVM = System.getProperty("sun.arch.data.model").equals("32"); boolean x86JVM = System.getProperty("os.arch").contains("32");
if (x86OS != x86JVM) { if (x86OS != x86JVM) {
debug("====== UPGRADE TO 64-BIT JAVA ======"); debug("====== UPGRADE TO 64-BIT JAVA ======");
debug("You are running 32-bit Java on a 64-bit machine"); debug("You are running 32-bit Java on a 64-bit machine");