Updated Branches: refs/heads/4.2 8df22d181 -> f42704125
CLOUDSTACK-4314: fix dir error in ProcessUtil.pidCheck (cherry picked from commit eb59c3c601bbce63045364cd7ddc35359893f120) Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f4270412 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f4270412 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f4270412 Branch: refs/heads/4.2 Commit: f427041259c209b6295ee7109b6befc0a080e617 Parents: 8df22d1 Author: Wei Zhou <[email protected]> Authored: Wed Aug 14 09:53:53 2013 +0200 Committer: Wei Zhou <[email protected]> Committed: Wed Aug 14 09:53:53 2013 +0200 ---------------------------------------------------------------------- utils/src/com/cloud/utils/ProcessUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f4270412/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 c9fdf35..365a242 100644 --- a/utils/src/com/cloud/utils/ProcessUtil.java +++ b/utils/src/com/cloud/utils/ProcessUtil.java @@ -54,7 +54,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) {
