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

Correct Jython termination (PY-2591).

Browse Source
This commit is contained in:
Dmitry Trofimov
2011-05-19 18:28:08 +04:00
parent 8b4ec046e0
commit af3dceb243
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/execution/runners/AbstractConsoleRunnerWithHistory.java
+1 -1
View File
@@ -102,7 +102,7 @@ public abstract class AbstractConsoleRunnerWithHistory<T extends LanguageConsole
myConsoleView = createConsoleView();
myConsoleView.setBorder(new SideBorder(UIUtil.getBorderColor(), SideBorder.LEFT));
myProcessHandler = createProcessHandler(process, myProvider.getCommandLineString());
myProcessHandler = createProcessHandler(process, myProvider.getCommandLineString());
myConsoleExecuteActionHandler = createConsoleExecuteActionHandler();
platform/platform-api/src/com/intellij/execution/configurations/GeneralCommandLine.java
+2 -1
View File
@@ -19,6 +19,7 @@ import com.intellij.execution.ExecutionException;
import com.intellij.execution.process.ProcessNotCreatedException;
import com.intellij.ide.IdeBundle;
import com.intellij.openapi.util.SystemInfo;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.vfs.CharsetToolkit;
import com.intellij.util.containers.HashMap;
import org.jetbrains.annotations.NonNls;
@@ -85,7 +86,7 @@ public class GeneralCommandLine {
}
public String getCommandLineString() {
final StringBuffer buffer = new StringBuffer(quoteParameter(myExePath));
final StringBuffer buffer = new StringBuffer(quoteParameter(FileUtil.toSystemDependentName(myExePath)));
appendParams( buffer );
return buffer.toString();
}
platform/platform-api/src/com/intellij/execution/process/OSProcessHandler.java
+4
View File
@@ -187,6 +187,10 @@ public class OSProcessHandler extends ProcessHandler {
}
protected void destroyProcessImpl() {
closeStreamsAndDestroyProcess();
}
protected void closeStreamsAndDestroyProcess() {
try {
closeStreams();
}