From e5c7bb64f7ea88b517281d8ed312115c3123f322 Mon Sep 17 00:00:00 2001
From: Waqas Ilyas <waqas.ilyas@gmail.com>
Date: Wed, 2 May 2018 18:37:29 -0500
Subject: [PATCH] Bug 534286. Made read(byte[],int,int) blocking

Added a loop in read(byte[], int, int) to block until any input is
available. Or until the port is closed, or an exception occurs.

Change-Id: I1ead6f465571274e77e74de685b8185c8cdde108
Signed-off-by: Waqas Ilyas <waqas.ilyas@gmail.com>
---
 .../org/eclipse/cdt/serial/SerialPort.java    | 39 +++++++++++++------
 1 file changed, 28 insertions(+), 11 deletions(-)

diff --git a/native/org.eclipse.cdt.native.serial/src/org/eclipse/cdt/serial/SerialPort.java b/native/org.eclipse.cdt.native.serial/src/org/eclipse/cdt/serial/SerialPort.java
index abbeacb5f9b..8b49cf9e676 100644
--- a/native/org.eclipse.cdt.native.serial/src/org/eclipse/cdt/serial/SerialPort.java
+++ b/native/org.eclipse.cdt.native.serial/src/org/eclipse/cdt/serial/SerialPort.java
@@ -103,21 +103,38 @@ public class SerialPort {
 					rpos += n;
 					return n;
 				} else {
-					n = read1(handle, b, off, len);
-					if (n <= 0 && isPaused) {
-						synchronized (pauseMutex) {
-							while (isPaused) {
-								try {
-									pauseMutex.wait();
-								} catch (InterruptedException e) {
-									return -1;
+					while (isOpen()) {
+						n = read1(handle, b, off, len);
+						if (n <= 0 ) {
+							if (isPaused) {
+								synchronized (pauseMutex) {
+									while (isPaused) {
+										try {
+											pauseMutex.wait();
+										} catch (InterruptedException e) {
+											return -1;
+										}
+									}
 								}
 							}
+							else if (n < 0) {
+								// End of stream, connection closed?
+								return n;
+							}
+							else {
+								// Nothing available yet, keep blocking
+								try {
+									Thread.sleep(500);
+								} catch (InterruptedException e) {
+									// ignore
+								}
+							}
+						} else {
+							return n;
 						}
-						return read1(handle, b, off, len);
-					} else {
-						return n;
 					}
+					
+					return -1;
 				}
 			} else {
 				return -1;