From 66eec6c8700453afd3aa35dc59cbe7833fd8e875 Mon Sep 17 00:00:00 2001 From: mike wakerly Date: Wed, 19 Mar 2014 21:59:13 -0700 Subject: [PATCH] open(): Set mConnection eagerly, and clear on failure. Similar to CdcAcmSerialDriver. Issue #53. --- .../com/hoho/android/usbserial/driver/FtdiSerialDriver.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/UsbSerialLibrary/src/com/hoho/android/usbserial/driver/FtdiSerialDriver.java b/UsbSerialLibrary/src/com/hoho/android/usbserial/driver/FtdiSerialDriver.java index e3bd660..3950ddd 100644 --- a/UsbSerialLibrary/src/com/hoho/android/usbserial/driver/FtdiSerialDriver.java +++ b/UsbSerialLibrary/src/com/hoho/android/usbserial/driver/FtdiSerialDriver.java @@ -243,6 +243,7 @@ public class FtdiSerialDriver implements UsbSerialDriver { if (mConnection != null) { throw new IOException("Already open"); } + mConnection = connection; boolean opened = false; try { @@ -258,8 +259,7 @@ public class FtdiSerialDriver implements UsbSerialDriver { } finally { if (!opened) { close(); - } else { - mConnection = connection; + mConnection = null; } } }