Prevent BriefcaseException for trying to access a request's body when…

… it's not present
getodk · Oct 31, 2020 · 62f552b · 62f552b
1 parent 8916aff
commit 62f552b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/org/opendatakit/briefcase/reused/http/CommonsHttp.java b/src/org/opendatakit/briefcase/reused/http/CommonsHttp.java
@@ -152,7 +152,7 @@ private <T> Response<T> uncheckedExecute(Request<T> request, Executor executor)
     } catch (IOException e) {
       throw new UncheckedIOException(e);
     } finally {
-      UncheckedFiles.closeInputStream(request.getBody());
+      request.ifBody(UncheckedFiles::closeInputStream);
       if (request.multipartMessages != null)
         request.multipartMessages.stream()
           .map(MultipartMessage::getBody)

diff --git a/src/org/opendatakit/briefcase/reused/http/Request.java b/src/org/opendatakit/briefcase/reused/http/Request.java
@@ -25,6 +25,7 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.function.BiConsumer;
+import java.util.function.Consumer;
 import java.util.function.Function;
 import org.opendatakit.briefcase.reused.BriefcaseException;
 import org.slf4j.Logger;
@@ -124,6 +125,10 @@ public InputStream getBody() {
     return body.orElseThrow(BriefcaseException::new);
   }
 
+  public void ifBody(Consumer<InputStream> consumer) {
+    body.ifPresent(consumer);
+  }
+
   public boolean ignoreCookies() {
     return ignoreCookies;
   }