android/okhttp
1
0
Fork 0
mirror of https://github.com/square/okhttp.git synced 2026-01-22 15:42:00 +03:00
Code Releases Activity

Merge pull request #513 from adamsp/master

Browse Source 
Fix for NPE when the OpenSSLSocketImpl returns null from getNpnSelectedProtocol
This commit is contained in:
Adrian Cole
2014-02-06 01:36:25 +01:00
parent 85fbb0abeb 0ca4c82dd1
commit 08b68ac717
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
okhttp-protocols/src/main/java/com/squareup/okhttp/internal/Platform.java
View File

@@ -293,7 +293,9 @@ public class Platform {
byte[] alpnResult = (byte[]) getAlpnSelectedProtocol.invoke(socket);
if (alpnResult != null) return ByteString.of(alpnResult);
}
return ByteString.of((byte[]) getNpnSelectedProtocol.invoke(socket));
byte[] npnResult = (byte[]) getNpnSelectedProtocol.invoke(socket);
if (npnResult == null) return null;
return ByteString.of(npnResult);
} catch (InvocationTargetException e) {
throw new RuntimeException(e);
} catch (IllegalAccessException e) {