h4ckx0r/engine.io-client-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #8 from andrepew/master

Browse Source 
When an Android app doesn't have the INTERNET permission, getHeaderFields() returns null resulting in NPE
This commit is contained in:
Naoyuki Kanezawa
2014-08-10 18:07:20 +09:00
parent 8616c2b8e9 20f57e345d
commit 2af0982890
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/github/nkzawa/engineio/client/transports/PollingXHR.java
View File

@@ -201,10 +201,15 @@ public class PollingXHR extends Polling {
} }
Map<String, String> headers = new TreeMap<String, String>(String.CASE_INSENSITIVE_ORDER); Map<String, String> headers = new TreeMap<String, String>(String.CASE_INSENSITIVE_ORDER);
for (String key : xhr.getHeaderFields().keySet()) {
if (key == null) continue; Map<String, List<String>> xhrHeaderFields = xhr.getHeaderFields();
headers.put(key, xhr.getHeaderField(key)); if(xhrHeaderFields != null) {
for (String key : xhrHeaderFields.keySet()) {
if (key == null) continue;
headers.put(key, xhr.getHeaderField(key));
}
} }
self.onResponseHeaders(headers); self.onResponseHeaders(headers);
final int statusCode = xhr.getResponseCode(); final int statusCode = xhr.getResponseCode();