rik/jlibloader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't set 'user.dir' if the working directory could not be set.

Browse Source
This commit is contained in:
Adam Murdoch
2013-02-07 18:04:44 +11:00
parent 6cab15ece4
commit 0c5d0dfe80
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/net/rubygrapefruit/platform/internal/DefaultProcess.java
View File

@@ -32,27 +32,26 @@ public class DefaultProcess implements Process {
public File getWorkingDirectory() throws NativeException { public File getWorkingDirectory() throws NativeException {
FunctionResult result = new FunctionResult(); FunctionResult result = new FunctionResult();
String dir;
synchronized (workingDirectoryLock) { synchronized (workingDirectoryLock) {
dir = PosixProcessFunctions.getWorkingDirectory(result); String dir = PosixProcessFunctions.getWorkingDirectory(result);
if (result.isFailed()) {
throw new NativeException(String.format("Could not get process working directory: %s",
result.getMessage()));
}
return new File(dir);
} }
if (result.isFailed()) {
throw new NativeException(String.format("Could not get process working directory: %s",
result.getMessage()));
}
return new File(dir);
} }
public void setWorkingDirectory(File directory) throws NativeException { public void setWorkingDirectory(File directory) throws NativeException {
FunctionResult result = new FunctionResult(); FunctionResult result = new FunctionResult();
synchronized (workingDirectoryLock) { synchronized (workingDirectoryLock) {
PosixProcessFunctions.setWorkingDirectory(directory.getAbsolutePath(), result); PosixProcessFunctions.setWorkingDirectory(directory.getAbsolutePath(), result);
if (result.isFailed()) {
throw new NativeException(String.format("Could not set process working directory: %s",
result.getMessage()));
}
System.setProperty("user.dir", directory.getAbsolutePath()); System.setProperty("user.dir", directory.getAbsolutePath());
} }
if (result.isFailed()) {
throw new NativeException(String.format("Could not set process working directory: %s",
result.getMessage()));
}
} }
public String getEnvironmentVariable(String name) throws NativeException { public String getEnvironmentVariable(String name) throws NativeException {