Bug 540259 - NPE in ProcessConsole$InputReadJob.run
Change-Id: Ib4c5510e95e2d707e9b649c010cc6d16ffe01609
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsole.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsole.java
index 2eba117..69c8bb9 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsole.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsole.java
@@ -101,7 +101,7 @@
private IConsoleColorProvider fColorProvider;
- private InputStream fInput;
+ private volatile InputStream fInput;
private FileOutputStream fFileOutputStream;
@@ -729,8 +729,12 @@
try {
byte[] b = new byte[1024];
int read = 0;
- while (fInput != null && read >= 0) {
- read = fInput.read(b);
+ while (read >= 0) {
+ InputStream input = fInput;
+ if (input == null) {
+ break;
+ }
+ read = input.read(b);
if (read > 0) {
String s;
if (encoding != null) {
