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

use console buffer in log (EA-31165 - OOME: LogConsoleBase.addMessage)

Browse Source
This commit is contained in:
anna
2012-08-02 19:16:55 +02:00
parent 1371495578
commit 9e67dd38de
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/diagnostic/logging/LogConsoleBase.java
+8
View File
@@ -18,6 +18,7 @@ package com.intellij.diagnostic.logging;
import com.intellij.execution.filters.TextConsoleBuilder;
import com.intellij.execution.filters.TextConsoleBuilderFactory;
import com.intellij.execution.impl.ConsoleBuffer;
import com.intellij.execution.impl.ConsoleViewImpl;
import com.intellij.execution.process.ProcessAdapter;
import com.intellij.execution.process.ProcessEvent;
@@ -370,6 +371,13 @@ public abstract class LogConsoleBase extends AdditionalTabComponent implements L
if (editor != null) {
myOriginalDocument = new StringBuffer(editor.getDocument().getText());
}
} else {
if (ConsoleBuffer.useCycleBuffer()) {
final int toRemove = myOriginalDocument.length() - ConsoleBuffer.getCycleBufferSize();
if (toRemove > 0) {
myOriginalDocument.delete(0, toRemove);
}
}
}
return myOriginalDocument;
}
platform/lang-impl/src/com/intellij/execution/impl/ConsoleBuffer.java
+2 -2
View File
@@ -119,12 +119,12 @@ public class ConsoleBuffer {
myContentTypesToNotStripOnCycling.add(ConsoleViewContentType.USER_INPUT);
}
private static boolean useCycleBuffer() {
public static boolean useCycleBuffer() {
final String useCycleBufferProperty = System.getProperty("idea.cycle.buffer.size");
return useCycleBufferProperty == null || !"disabled".equalsIgnoreCase(useCycleBufferProperty);
}
private static int getCycleBufferSize() {
public static int getCycleBufferSize() {
final String cycleBufferSizeProperty = System.getProperty("idea.cycle.buffer.size");
if (cycleBufferSizeProperty == null) return 1024 * 1024;
try {