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 0977070e2a2883adba4a49b772712c5c6dd436b0..a8519550d98b62dd4e757243ce5f435a4d51409e 100644 (file)
--- a/altoslib/AltosFlash.java
+++ b/altoslib/AltosFlash.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_2;
+package org.altusmetrum.altoslib_5;
 
 import java.io.*;
 
@@ -345,9 +345,23 @@ public class AltosFlash extends AltosProgrammer {
                        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
+}