Bug 567736: [RJ-Servi] Fix validation of R_ARCH in LocalNodeFactory
Follow-up-to: a7b007843c0702e2be42e314717dedaaa50207c5
Change-Id: I920d380bfb553c2ce3eb8de9742e0ca41a4b3156
diff --git a/servi/org.eclipse.statet.rj.servi/src/org/eclipse/statet/internal/rj/servi/LocalNodeFactory.java b/servi/org.eclipse.statet.rj.servi/src/org/eclipse/statet/internal/rj/servi/LocalNodeFactory.java
index 7b7ca9c..136df06 100644
--- a/servi/org.eclipse.statet.rj.servi/src/org/eclipse/statet/internal/rj/servi/LocalNodeFactory.java
+++ b/servi/org.eclipse.statet.rj.servi/src/org/eclipse/statet/internal/rj/servi/LocalNodeFactory.java
@@ -314,12 +314,13 @@
if (rArch.equals("x86_64")) {
rArch= "x64";
}
- if (!Files.isDirectory(rHomeDir.resolve(rArch))) {
+ final var binDir= rHomeDir.resolve("bin");
+ if (!Files.isDirectory(binDir.resolve(rArch))) {
rArch= null;
}
}
else {
- final Path execDir= rHomeDir.resolve("bin").resolve("exec");
+ final var execDir= rHomeDir.resolve("bin").resolve("exec");
if (!Files.isDirectory(execDir.resolve(rArch))) {
if (Files.isDirectory(execDir) &&
(rArch.equals("i386") || rArch.equals("i586") || rArch.equals("i686")) ) {
