projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: AltosSerial.flush_input shouldn't discard Interrupted exceptions
[fw/altos]
/
altosui
/
AltosSerial.java
diff --git
a/altosui/AltosSerial.java
b/altosui/AltosSerial.java
index b089c9c40c580beb7764135fb0c3ead7be9a374a..f0e25fa56dd110e697e34db7566e0816862ad55a 100644
(file)
--- a/
altosui/AltosSerial.java
+++ b/
altosui/AltosSerial.java
@@
-187,7
+187,7
@@
public class AltosSerial implements Runnable {
return abort;
}
return abort;
}
- public void flush_input() {
+ public void flush_input()
throws InterruptedException
{
flush_output();
boolean got_some;
flush_output();
boolean got_some;
@@
-195,10
+195,7
@@
public class AltosSerial implements Runnable {
if (remote)
timeout = 500;
do {
if (remote)
timeout = 500;
do {
- try {
- Thread.sleep(timeout);
- } catch (InterruptedException ie) {
- }
+ Thread.sleep(timeout);
got_some = !reply_queue.isEmpty();
synchronized(this) {
if (!"VERSION".startsWith(line) &&
got_some = !reply_queue.isEmpty();
synchronized(this) {
if (!"VERSION".startsWith(line) &&
@@
-271,8
+268,12
@@
public class AltosSerial implements Runnable {
}
public void close() {
}
public void close() {
- if (remote)
- stop_remote();
+ if (remote) {
+ try {
+ stop_remote();
+ } catch (InterruptedException ie) {
+ }
+ }
if (in_reply != 0)
System.out.printf("Uh-oh. Closing active serial device\n");
if (in_reply != 0)
System.out.printf("Uh-oh. Closing active serial device\n");
@@
-422,7
+423,7
@@
public class AltosSerial implements Runnable {
remote = true;
}
remote = true;
}
- public void stop_remote() {
+ public void stop_remote()
throws InterruptedException
{
if (debug)
System.out.printf("stop remote\n");
try {
if (debug)
System.out.printf("stop remote\n");
try {