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++; |
+ } |
} |
} |