altos: Correct AO_CONFIG_MINOR from 6 to 7

[fw/altos] / altosui / AltosSerial.java

diff --git a/altosui/AltosSerial.java b/altosui/AltosSerial.java
index 5d4510b46679ff89cdf138ee47fc0f0e21426321..f0e25fa56dd110e697e34db7566e0816862ad55a 100644 (file)
--- a/altosui/AltosSerial.java
+++ b/altosui/AltosSerial.java
@@ -187,7 +187,7 @@ public class AltosSerial implements Runnable {
                return abort;
        }
 
-       public void flush_input() {
+       public void flush_input() throws InterruptedException {
                flush_output();
                boolean got_some;
 
@@ -195,10 +195,7 @@ public class AltosSerial implements Runnable {
                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) &&
@@ -213,30 +210,38 @@ public class AltosSerial implements Runnable {
 
        public String get_reply(int timeout) throws InterruptedException {
                boolean can_cancel = true;
-               ++in_reply;
+               String  reply = null;
 
-               if (SwingUtilities.isEventDispatchThread()) {
-                       can_cancel = false;
-                       System.out.printf("Uh-oh, reading serial device from swing thread\n");
-               }
-               flush_output();
-               if (remote && can_cancel) {
-                       timeout = 500;
-               }
-               abort = false;
-               timeout_started = false;
-               for (;;) {
-                       AltosLine line = reply_queue.poll(timeout, TimeUnit.MILLISECONDS);
-                       if (line != null) {
-                               stop_timeout_dialog();
-                               --in_reply;
-                               return line.line;
+               try {
+                       ++in_reply;
+
+                       if (SwingUtilities.isEventDispatchThread()) {
+                               can_cancel = false;
+                               if (remote)
+                                       System.out.printf("Uh-oh, reading remote serial device from swing thread\n");
                        }
-                       if (!remote || !can_cancel || check_timeout()) {
-                               --in_reply;
-                               return null;
+                       flush_output();
+                       if (remote && can_cancel) {
+                               timeout = 500;
                        }
+                       abort = false;
+                       timeout_started = false;
+                       for (;;) {
+                               AltosLine line = reply_queue.poll(timeout, TimeUnit.MILLISECONDS);
+                               if (line != null) {
+                                       stop_timeout_dialog();
+                                       reply = line.line;
+                                       break;
+                               }
+                               if (!remote || !can_cancel || check_timeout()) {
+                                       reply = null;
+                                       break;
+                               }
+                       }
+               } finally {
+                       --in_reply;
                }
+               return reply;
        }
 
        public String get_reply() throws InterruptedException {
@@ -263,8 +268,12 @@ public class AltosSerial implements Runnable {
        }
 
        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");
 
@@ -414,7 +423,7 @@ public class AltosSerial implements Runnable {
                remote = true;
        }
 
-       public void stop_remote() {
+       public void stop_remote() throws InterruptedException {
                if (debug)
                        System.out.printf("stop remote\n");
                try {