Merge remote-tracking branch 'origin/dev' into feature/gradleRewrite

This commit is contained in:
zaxar163 2019-01-25 11:58:51 +03:00
commit 8475d92362

View file

@ -16,7 +16,7 @@ public String getName() {
@Override @Override
public Path getJavaBinPath() { public Path getJavaBinPath() {
if (JVMHelper.OS_TYPE == JVMHelper.OS.MUSTDIE) if (JVMHelper.OS_TYPE == JVMHelper.OS.MUSTDIE)
return ClientLauncher.getJavaBinPath(); return IOHelper.resolveJavaBin(ClientLauncher.getJavaBinPath());
else else
return IOHelper.resolveJavaBin(Paths.get(System.getProperty("java.home"))); return IOHelper.resolveJavaBin(Paths.get(System.getProperty("java.home")));
} }