From eb59c3c601bbce63045364cd7ddc35359893f120 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Wed, 14 Aug 2013 09:41:13 +0200 Subject: [PATCH] CLOUDSTACK-4314: fix dir error in ProcessUtil.pidCheck and Revert commit 9375aa9467c3855f28c6753d1eb4932a6f1a0e6f --- utils/src/com/cloud/utils/ProcessUtil.java | 2 +- utils/test/com/cloud/utils/ProcessUtilTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/src/com/cloud/utils/ProcessUtil.java b/utils/src/com/cloud/utils/ProcessUtil.java index 7f16f98d1c7..e64c931032e 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) { diff --git a/utils/test/com/cloud/utils/ProcessUtilTest.java b/utils/test/com/cloud/utils/ProcessUtilTest.java index 8f563c303aa..503a855cfa9 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