From 7591ab84b5378df8d2aa790f8bf8adf33677ab7a Mon Sep 17 00:00:00 2001 From: Ian Clelland Date: Tue, 8 Jul 2014 12:51:44 -0400 Subject: [PATCH] CB-6503: Null pointer check for headers in upload (This closes #27) --- src/amazon/FileTransfer.java | 2 +- src/android/FileTransfer.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/amazon/FileTransfer.java b/src/amazon/FileTransfer.java index a7e74d3..1563a39 100644 --- a/src/amazon/FileTransfer.java +++ b/src/amazon/FileTransfer.java @@ -317,7 +317,7 @@ public class FileTransfer extends CordovaPlugin { conn.setRequestMethod(httpMethod); // if we specified a Content-Type header, don't do multipart form upload - boolean multipartFormUpload = !headers.has("Content-Type"); + boolean multipartFormUpload = (headers == null) || !headers.has("Content-Type"); if (multipartFormUpload) { conn.setRequestProperty("Content-Type", "multipart/form-data; boundary=" + BOUNDARY); } diff --git a/src/android/FileTransfer.java b/src/android/FileTransfer.java index 2824110..9c8dacb 100644 --- a/src/android/FileTransfer.java +++ b/src/android/FileTransfer.java @@ -343,7 +343,7 @@ public class FileTransfer extends CordovaPlugin { conn.setRequestMethod(httpMethod); // if we specified a Content-Type header, don't do multipart form upload - boolean multipartFormUpload = !headers.has("Content-Type"); + boolean multipartFormUpload = (headers == null) || !headers.has("Content-Type"); if (multipartFormUpload) { conn.setRequestProperty("Content-Type", "multipart/form-data; boundary=" + BOUNDARY); }