Merge c093307 into c559a12

sjamesr · May 16, 2020 · f45102e · f45102e
2 parents c559a12 + c093307
commit f45102e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/main/java/au/com/southsky/jfreesane/SaneInputStream.java b/src/main/java/au/com/southsky/jfreesane/SaneInputStream.java
@@ -55,6 +55,9 @@ public List<SaneDevice> readDeviceList() throws IOException, SaneException {
     int length = readWord().integerValue() - 1;
 
     if (length <= 0) {
+      // remove leftover word from stream to prevent it from breaking
+      // the following operation in this session
+      readWord();
       return new ArrayList<>(0);
     }
 

diff --git a/src/test/java/au/com/southsky/jfreesane/SaneSessionTest.java b/src/test/java/au/com/southsky/jfreesane/SaneSessionTest.java
@@ -3,7 +3,6 @@
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -377,7 +376,6 @@ public void arrayOption() throws Exception {
   }
 
   @Test
-  @Ignore // This test fails on Travis with UNSUPPORTED.
   public void multipleListDevicesCalls() throws Exception {
     session.listDevices();
     session.listDevices();