Merge pull request square#513 from adamsp/master

Fix for NPE when the OpenSSLSocketImpl returns null from getNpnSelectedProtocol
carck · Feb 6, 2014 · 08b68ac · 08b68ac
2 parents 85fbb0a + 0ca4c82
commit 08b68ac
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/okhttp-protocols/src/main/java/com/squareup/okhttp/internal/Platform.java b/okhttp-protocols/src/main/java/com/squareup/okhttp/internal/Platform.java
@@ -293,7 +293,9 @@ private Android(
           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) {