android_webview/java/src/org/chromium/android_webview/AwWebResourceResponse.java - Issue 392113002: [android_webview] Support null AwWebResourceResponse headers.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: android_webview/java/src/org/chromium/android_webview/AwWebResourceResponse.java

Issue 392113002: [android_webview] Support null AwWebResourceResponse headers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: use equals instead of == Created 6 years, 5 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 | android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldInterceptRequestTest.java » ('j') | build/android/pylib/base/base_test_runner.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: android_webview/java/src/org/chromium/android_webview/AwWebResourceResponse.java

diff --git a/android_webview/java/src/org/chromium/android_webview/AwWebResourceResponse.java b/android_webview/java/src/org/chromium/android_webview/AwWebResourceResponse.java

index 1b861c01b43d6fba64dae32b708a363d00f0ad8f..52baca1ea252344e3d8aef17e874a72d7f1f9c9b 100644

--- a/android_webview/java/src/org/chromium/android_webview/AwWebResourceResponse.java

+++ b/android_webview/java/src/org/chromium/android_webview/AwWebResourceResponse.java

@@ -36,13 +36,15 @@ public class AwWebResourceResponse {

mStatusCode = statusCode;

mReasonPhrase = reasonPhrase;

- mResponseHeaderNames = new String[responseHeaders.size()];

- mResponseHeaderValues = new String[responseHeaders.size()];

- int i = 0;

- for (Map.Entry<String, String> entry : responseHeaders.entrySet()) {

- mResponseHeaderNames[i] = entry.getKey();

- mResponseHeaderValues[i] = entry.getValue();

- i++;

+ if (responseHeaders != null) {

+ mResponseHeaderNames = new String[responseHeaders.size()];

+ mResponseHeaderValues = new String[responseHeaders.size()];

+ int i = 0;

+ for (Map.Entry<String, String> entry : responseHeaders.entrySet()) {

+ mResponseHeaderNames[i] = entry.getKey();

+ mResponseHeaderValues[i] = entry.getValue();

+ i++;

+ }

}