Index: components/cronet/android/java/src/org/chromium/net/ChromiumUrlRequest.java |
diff --git a/components/cronet/android/java/src/org/chromium/net/ChromiumUrlRequest.java b/components/cronet/android/java/src/org/chromium/net/ChromiumUrlRequest.java |
index d067cf6559a912cf037252112008ddf399ca80b8..ed448f2571c11bd8f5b0ca07db29f160f7ece931 100644 |
--- a/components/cronet/android/java/src/org/chromium/net/ChromiumUrlRequest.java |
+++ b/components/cronet/android/java/src/org/chromium/net/ChromiumUrlRequest.java |
@@ -214,6 +214,7 @@ public class ChromiumUrlRequest implements HttpUrlRequest { |
public void setUploadData(String contentType, byte[] data) { |
synchronized (mLock) { |
validateNotStarted(); |
+ validateContentType(contentType); |
mUploadContentType = contentType; |
mUploadData = data; |
mUploadChannel = null; |
@@ -234,6 +235,7 @@ public class ChromiumUrlRequest implements HttpUrlRequest { |
ReadableByteChannel channel, long contentLength) { |
synchronized (mLock) { |
validateNotStarted(); |
+ validateContentType(contentType); |
mUploadContentType = contentType; |
mUploadChannel = channel; |
mUploadContentLength = contentLength; |
@@ -252,6 +254,7 @@ public class ChromiumUrlRequest implements HttpUrlRequest { |
public void setChunkedUpload(String contentType) { |
synchronized (mLock) { |
validateNotStarted(); |
+ validateContentType(contentType); |
mUploadContentType = contentType; |
mChunkedUpload = true; |
mUploadData = null; |
@@ -455,6 +458,12 @@ public class ChromiumUrlRequest implements HttpUrlRequest { |
} |
} |
+ private void validateContentType(String contentType) { |
+ if (contentType == null) { |
+ throw new NullPointerException("contentType is required"); |
+ } |
+ } |
+ |
// Private methods called by native library. |
/** |