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

release log file on process terminated as well as on disposed (IDEA-55168 )

Browse Source
This commit is contained in:
anna
2010-11-17 12:38:09 +03:00
parent f6c44b5b1a
commit 8fbdd13bda
1 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/diagnostic/logging/LogConsoleBase.java
+25 -15
View File
@@ -258,17 +258,7 @@ public abstract class LogConsoleBase extends AdditionalTabComponent implements L
public void dispose() {
myModel.removeFilterListener(this);
if (myReaderThread != null && myReaderThread.myReader != null) {
myReaderThread.stopRunning();
try {
myReaderThread.myReader.close();
}
catch (IOException e) {
LOG.warn(e);
}
myReaderThread.myReader = null;
myReaderThread = null;
}
stopRunning(false);
if (myConsole != null) {
Disposer.dispose(myConsole);
myConsole = null;
@@ -280,9 +270,29 @@ public abstract class LogConsoleBase extends AdditionalTabComponent implements L
myOriginalDocument = null;
}
private void stopRunning() {
if (myReaderThread != null && !isActive()) {
myReaderThread.stopRunning();
private void stopRunning(boolean checkActive) {
if (myReaderThread != null && myReaderThread.myReader != null) {
if (!checkActive) {
myReaderThread.stopRunning();
try {
myReaderThread.myReader.close();
}
catch (IOException e) {
LOG.warn(e);
}
myReaderThread.myReader = null;
myReaderThread = null;
}
else {
try {
final BufferedReader reader = myReaderThread.myReader;
while (reader != null && reader.ready()) {
addMessage(reader.readLine());
}
}
catch (IOException ignore) {}
stopRunning(false);
}
}
}
@@ -317,7 +327,7 @@ public abstract class LogConsoleBase extends AdditionalTabComponent implements L
final ProcessAdapter stopListener = new ProcessAdapter() {
public void processTerminated(final ProcessEvent event) {
process.removeProcessListener(this);
stopRunning();
stopRunning(true);
}
};
process.addProcessListener(stopListener);