returning a 0 length array when position -1

XCSoar · Jan 4, 2018 · e9d27bb · e9d27bb
1 parent 09a3f86
commit e9d27bb
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/build.gradle b/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.0'
+        classpath 'com.android.tools.build:gradle:2.2.3'
     }
 }
 

diff --git a/usbserial/src/main/java/com/felhr/usbserial/SerialBuffer.java b/usbserial/src/main/java/com/felhr/usbserial/SerialBuffer.java
@@ -149,7 +149,7 @@ public synchronized byte[] get()
                     e.printStackTrace();
                 }
             }
-            if(position <= -1 ) return new byte[DEFAULT_READ_BUFFER_SIZE];
+            if(position <= -1 ) return new byte[0];
             byte[] dst =  Arrays.copyOfRange(buffer, 0, position);
             if(debugging)
                 UsbSerialDebugger.printLogGet(dst, true);

diff --git a/usbserial/src/main/java/com/felhr/usbserial/UsbSerialDevice.java b/usbserial/src/main/java/com/felhr/usbserial/UsbSerialDevice.java
@@ -304,7 +304,8 @@ public void run()
             while(working.get())
             {
                 byte[] data = serialBuffer.getWriteBuffer();
-                connection.bulkTransfer(outEndpoint, data, data.length, USB_TIMEOUT);
+                if(data.length > 0)
+                    connection.bulkTransfer(outEndpoint, data, data.length, USB_TIMEOUT);
             }
         }
 

diff --git a/usbserial/src/main/java/com/felhr/usbserial/UsbSpiDevice.java b/usbserial/src/main/java/com/felhr/usbserial/UsbSpiDevice.java
@@ -99,7 +99,8 @@ public void run()
             while(working.get())
             {
                 byte[] data = serialBuffer.getWriteBuffer();
-                connection.bulkTransfer(outEndpoint, data, data.length, USB_TIMEOUT);
+                if(data.length > 0)
+                    connection.bulkTransfer(outEndpoint, data, data.length, USB_TIMEOUT);
             }
         }