Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(26)

Unified Diff: components/cronet/android/java/src/org/chromium/net/ChromiumUrlRequest.java

Issue 526503002: SetUploadData now throws an exception if contentType is null. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address review comment. Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | components/cronet/android/sample/javatests/src/org/chromium/cronet_sample_apk/CronetSampleUrlTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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.
/**
« no previous file with comments | « no previous file | components/cronet/android/sample/javatests/src/org/chromium/cronet_sample_apk/CronetSampleUrlTest.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698