summaryrefslogtreecommitdiff
path: root/altoslib/AltosDebug.java
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2014-08-17 20:50:38 -0700
committerKeith Packard <keithp@keithp.com>2014-08-17 20:50:38 -0700
commit76fd424e4624cb376ac2cf84b01b77599756680a (patch)
tree51fd470462b7d26e6160eb348c6748626675b832 /altoslib/AltosDebug.java
parent935f769fee351545622e223a283fca64608ca410 (diff)
altoslib: Handle link timeout in AltosDebug.read_memory
link.get_reply returns null on a link error; don't crash in read_memory when this happens. Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'altoslib/AltosDebug.java')
-rw-r--r--altoslib/AltosDebug.java10
1 files changed, 7 insertions, 3 deletions
diff --git a/altoslib/AltosDebug.java b/altoslib/AltosDebug.java
index 6784f60a..e58fbaf2 100644
--- a/altoslib/AltosDebug.java
+++ b/altoslib/AltosDebug.java
@@ -52,7 +52,7 @@ public class AltosDebug {
public static final byte GET_CHIP_ID = 0x68;
- AltosLink link;
+ private AltosLink link;
boolean debug_mode;
@@ -112,7 +112,11 @@ public class AltosDebug {
int i = 0;
int start = 0;
while (i < length) {
- String line = link.get_reply().trim();
+ String line = link.get_reply();
+ if (line == null)
+ throw new IOException("No reply");
+
+ line = line.trim();
if (!AltosLib.ishex(line) || line.length() % 2 != 0)
throw new IOException(
String.format
@@ -277,4 +281,4 @@ public class AltosDebug {
public AltosDebug (AltosLink link) {
this.link = link;
}
-} \ No newline at end of file
+}