MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

lazy class loading for PtyProcess (r=Eugene.Zhuravlev)

Browse Source
This commit is contained in:
Maxim.Mossienko
2013-12-16 15:37:55 +01:00
parent 186cee5733
commit 96c8bca551
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-api/src/com/intellij/execution/configurations/GeneralCommandLine.java
+10 -8
View File
@@ -257,9 +257,14 @@ public class GeneralCommandLine implements UserDataHolder {
try {
if (myStartProcessWithPty && SystemInfo.isUnix) {
try {
return startProcessWithPty(commands);
Map<String, String> env = Maps.newHashMap();
setupEnvironment(env);
if (myRedirectErrorStream) {
LOG.error("Launching process with PTY and redirected error stream is unsupported yet");
}
return PtyProcessHolder.doExec(myWorkDirectory, commands, env);
}
catch (Exception e) {
catch (Throwable e) {
LOG.error("Couldn't run process with PTY", e);
}
}
@@ -272,13 +277,10 @@ public class GeneralCommandLine implements UserDataHolder {
}
}
private Process startProcessWithPty(List<String> commands) throws IOException {
Map<String, String> env = Maps.newHashMap();
setupEnvironment(env);
if (myRedirectErrorStream) {
LOG.error("Launching process with PTY and redirected error stream is unsupported yet");
private static class PtyProcessHolder { // holder for lazy PtyProcess class loading
private static PtyProcess doExec(File workDirectory, List<String> commands, Map<String, String> env) throws IOException {
return PtyProcess.exec(ArrayUtil.toStringArray(commands), env, workDirectory != null ? workDirectory.getPath() : null, true);
}
return PtyProcess.exec(ArrayUtil.toStringArray(commands), env, myWorkDirectory != null? myWorkDirectory.getPath() : null, true);
}
private Process startProcess(List<String> commands) throws IOException {