mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-22 14:12:10 +02:00
Code Issues Wiki Activity

Revert "Bug 534286. Made read(byte[],int,int) blocking"

Browse source 
This reverts commit e5c7bb64f7.

Change-Id: I565f9eb2728d0ff0199e61f3f25df4aa0b64f17b
This commit is contained in:
Doug Schaefer 2018-06-16 17:06:30 -04:00
parent 3b44424539
commit e6550c7a10
1 changed files with 9 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
native/org.eclipse.cdt.native.serial/src/org/eclipse/cdt/serial/SerialPort.java
View file

@ -103,10 +103,8 @@ public class SerialPort {
rpos += n; rpos += n;
return n; return n;
} else { } else {
while (isOpen()) {
n = read1(handle, b, off, len); n = read1(handle, b, off, len);
if (n <= 0 ) { if (n <= 0 && isPaused) {
if (isPaused) {
synchronized (pauseMutex) { synchronized (pauseMutex) {
while (isPaused) { while (isPaused) {
try { try {
@ -116,26 +114,11 @@ public class SerialPort {
} }
} }
} }
} return read1(handle, b, off, len);
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 { } else {
return n; return n;
} }
} }
return -1;
}
} else { } else {
return -1; return -1;
} }