From 3a5360c339a1190a7773ae2edc1db796c0161918 Mon Sep 17 00:00:00 2001 From: "minkee.lee" Date: Thu, 5 Nov 2015 10:47:47 +0900 Subject: [PATCH] check-net: set check-net process working directory - If it is not set, check-net could be run at unauthorized directory and it would fail when try creating new file. And this causes network failure in VM with host-proxy. Change-Id: Ie98ecdbcc143693fb3082f6fda9fbceb8ac6968b Signed-off-by: minkee.lee --- src/org/tizen/emulator/manager/vms/helper/HelperClass.java | 8 +++++++- src/org/tizen/emulator/manager/vms/option/NetProxyOption.java | 3 ++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/org/tizen/emulator/manager/vms/helper/HelperClass.java b/src/org/tizen/emulator/manager/vms/helper/HelperClass.java index b4f7043..9c22856 100644 --- a/src/org/tizen/emulator/manager/vms/helper/HelperClass.java +++ b/src/org/tizen/emulator/manager/vms/helper/HelperClass.java @@ -240,11 +240,17 @@ public class HelperClass { int exitValue = 0; Process process = null; - if (directory != null) { + String workingDirPath = null; + if (directory == null) { + workingDirPath = System.getProperty("user.dir"); + + } else { + workingDirPath = directory.getAbsolutePath(); pb.directory(directory); } EMLogger.getLogger().log(Level.INFO, "Try to run external process: " + cmd.get(0)); //$NON-NLS-1$ + EMLogger.getLogger().log(Level.INFO, " -- Working dir : " + workingDirPath); try { process = pb.start(); diff --git a/src/org/tizen/emulator/manager/vms/option/NetProxyOption.java b/src/org/tizen/emulator/manager/vms/option/NetProxyOption.java index 482e023..b55898c 100644 --- a/src/org/tizen/emulator/manager/vms/option/NetProxyOption.java +++ b/src/org/tizen/emulator/manager/vms/option/NetProxyOption.java @@ -122,7 +122,8 @@ public class NetProxyOption extends Option { List cmd = Arrays.asList(FilePathResources.getEmulatorCheckToolPath() + File.separator + proxyCommand, "--proxy"); //$NON-NLS-1$ - ProcessResult res = HelperClass.runProcess(cmd); + File workingDir = new File(FilePathResources.getToolEmulatorBinPath()); + ProcessResult res = HelperClass.runProcess(cmd, workingDir); EMLogger.getLogger().info( "check-net result : " + res.getResultMessage()); //$NON-NLS-1$ -- 2.7.4