diff options
-rw-r--r-- | org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/ConsoleTests.java | 30 | ||||
-rw-r--r-- | org.eclipse.ui.console/src/org/eclipse/ui/console/IOConsoleInputStream.java | 19 |
2 files changed, 28 insertions, 21 deletions
diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/ConsoleTests.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/ConsoleTests.java index cd9d51eae..b7950dc85 100644 --- a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/ConsoleTests.java +++ b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/ConsoleTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2017, 2018 Andreas Loth and others. + * Copyright (c) 2017, 2019 Andreas Loth and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -37,7 +37,6 @@ import org.eclipse.ui.console.MessageConsole; import junit.framework.TestCase; - public class ConsoleTests extends AbstractDebugTest { public ConsoleTests() { @@ -189,15 +188,36 @@ public class ConsoleTests extends AbstractDebugTest { } } + /** + * Tests for IOConsoleInputStream#available(). + * + * @throws Exception if test fails + */ public void testIOConsoleAvailable() throws Exception { + IOConsole console = new IOConsole("", null); + try (InputStream consoleInput = console.getInputStream()) { + consoleInput.available(); + consoleInput.available(); + } - final IOConsole console = new IOConsole("", null); + console = new IOConsole("", null); + try (InputStream consoleInput = console.getInputStream()) { + consoleInput.available(); + new Thread(() -> { + try { + Thread.sleep(100); + consoleInput.close(); + } catch (Exception e) { + } + }).start(); + assertEquals("read() did not signaled EOF.", -1, consoleInput.read()); + } + console = new IOConsole("", null); try (InputStream consoleInput = console.getInputStream()) { + consoleInput.close(); consoleInput.available(); consoleInput.available(); - } catch (IOException ioe) { - TestCase.assertEquals("Input Stream is closed", ioe.getMessage()); //$NON-NLS-1$ } } } diff --git a/org.eclipse.ui.console/src/org/eclipse/ui/console/IOConsoleInputStream.java b/org.eclipse.ui.console/src/org/eclipse/ui/console/IOConsoleInputStream.java index 04bc9468f..4cade5ad9 100644 --- a/org.eclipse.ui.console/src/org/eclipse/ui/console/IOConsoleInputStream.java +++ b/org.eclipse.ui.console/src/org/eclipse/ui/console/IOConsoleInputStream.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2018 IBM Corporation and others. + * Copyright (c) 2000, 2019 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -54,11 +54,6 @@ public class IOConsoleInputStream extends InputStream { private int size = 0; /** - * Flag to indicate that EOF has been sent already. - */ - private boolean eofSent = false; - - /** * Flag to indicate that the stream has been closed. */ private boolean closed = false; @@ -91,7 +86,7 @@ public class IOConsoleInputStream extends InputStream { @Override public synchronized int read(byte[] b, int off, int len) throws IOException { waitForData(); - if (available() == -1) { + if (available() == 0) { return -1; } @@ -118,7 +113,7 @@ public class IOConsoleInputStream extends InputStream { @Override public synchronized int read() throws IOException { waitForData(); - if (available() == -1) { + if (available() == 0) { return -1; } @@ -252,14 +247,6 @@ public class IOConsoleInputStream extends InputStream { @Override public int available() throws IOException { - if (closed && eofSent) { - throw new IOException("Input Stream Closed"); //$NON-NLS-1$ - } else if (size == 0) { - if (!eofSent) { - eofSent = true; - return -1; - } - } return size; } |