Updated Branches: refs/heads/master 39ed13aae -> eb59c3c60
CLOUDSTACK-4314: fix dir error in ProcessUtil.pidCheck and Revert commit 9375aa9467c3855f28c6753d1eb4932a6f1a0e6f Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/eb59c3c6 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/eb59c3c6 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/eb59c3c6 Branch: refs/heads/master Commit: eb59c3c601bbce63045364cd7ddc35359893f120 Parents: 39ed13a Author: Wei Zhou <[email protected]> Authored: Wed Aug 14 09:41:13 2013 +0200 Committer: Wei Zhou <[email protected]> Committed: Wed Aug 14 09:41:13 2013 +0200 ---------------------------------------------------------------------- utils/src/com/cloud/utils/ProcessUtil.java | 2 +- utils/test/com/cloud/utils/ProcessUtilTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/eb59c3c6/utils/src/com/cloud/utils/ProcessUtil.java ---------------------------------------------------------------------- diff --git a/utils/src/com/cloud/utils/ProcessUtil.java b/utils/src/com/cloud/utils/ProcessUtil.java index 7f16f98..e64c931 100644 --- a/utils/src/com/cloud/utils/ProcessUtil.java +++ b/utils/src/com/cloud/utils/ProcessUtil.java @@ -50,7 +50,7 @@ public class ProcessUtil { finputstream.close(); dir = props.getProperty("paths.pid"); if (dir == null) { - dir = "/var/run"; + dir = pidDir==null?"/var/run":pidDir; } } } catch (IOException e) { http://git-wip-us.apache.org/repos/asf/cloudstack/blob/eb59c3c6/utils/test/com/cloud/utils/ProcessUtilTest.java ---------------------------------------------------------------------- diff --git a/utils/test/com/cloud/utils/ProcessUtilTest.java b/utils/test/com/cloud/utils/ProcessUtilTest.java index 8f563c3..503a855 100644 --- a/utils/test/com/cloud/utils/ProcessUtilTest.java +++ b/utils/test/com/cloud/utils/ProcessUtilTest.java @@ -36,7 +36,7 @@ public class ProcessUtilTest { @Before public void setup() throws IOException { - pidFile = File.createTempFile("test", ".pid", new File("/var/run")); + pidFile = File.createTempFile("test", ".pid"); } @After
