etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-4314: fix dir error in ProcessUtil.pidCheck and Revert commit 9375aa9467

This commit is contained in:
Wei Zhou 2013-08-14 09:41:13 +02:00
parent 39ed13aaef
commit eb59c3c601
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
utils/src/com/cloud/utils/ProcessUtil.java
View File

@ -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) {

2
utils/test/com/cloud/utils/ProcessUtilTest.java
View File

@ -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