altoslib: Close serial port when AltosFlash fails to detect a target

[fw/altos] / altoslib / AltosFlash.java

diff --git a/altoslib/AltosFlash.java b/altoslib/AltosFlash.java
index 010274b944884ecf1e3339aad5f72a3e3221d18d..a8519550d98b62dd4e757243ce5f435a4d51409e 100644 (file)
--- a/altoslib/AltosFlash.java
+++ b/altoslib/AltosFlash.java
@@ -15,11 +15,11 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_1;
+package org.altusmetrum.altoslib_5;
 
 import java.io.*;
 
-public class AltosFlash {
+public class AltosFlash extends AltosProgrammer {
        File                    file;
        FileInputStream         input;
        AltosHexfile            image;
@@ -318,7 +318,7 @@ public class AltosFlash {
                close();
        }
 
-       public boolean check_rom_config() {
+       public boolean check_rom_config() throws InterruptedException {
                if (debug == null)
                        return true;
                if (rom_config == null)
@@ -330,7 +330,7 @@ public class AltosFlash {
                rom_config = romconfig;
        }
 
-       public AltosRomconfig romconfig() {
+       public AltosRomconfig romconfig() throws InterruptedException {
                if (!check_rom_config())
                        return null;
                return rom_config;
@@ -345,9 +345,23 @@ public class AltosFlash {
                        debug = new AltosDebug(link);
                input = new FileInputStream(file);
                image = new AltosHexfile(input);
-               if (debug != null && !debug.check_connection()) {
+
+               boolean connection_ok = true;
+
+               if (debug != null) {
+                       try {
+                               connection_ok = debug.check_connection();
+                       } catch (IOException ie) {
+                               debug.close();
+                               throw ie;
+                       } catch (InterruptedException ie) {
+                               debug.close();
+                               throw ie;
+                       }
+               }
+               if (!connection_ok) {
                        debug.close();
                        throw new IOException("Debug port not connected");
                }
        }
-}
\ No newline at end of file
+}