andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix NPE

Browse Source
This commit is contained in:
Trustin Lee 2014-05-22 10:28:38 +09:00
parent af3b358892
commit d803a75e2f
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
handler/src/main/java/io/netty/handler/ssl/JdkSslClientContext.java
View File

@ -106,7 +106,8 @@ public final class JdkSslClientContext extends JdkSslContext {
super(ciphers); super(ciphers);
if (nextProtocols != null && nextProtocols.iterator().hasNext() && !JettyNpnSslEngine.isAvailable()) { if (nextProtocols != null && nextProtocols.iterator().hasNext()) {
if (!JettyNpnSslEngine.isAvailable()) {
throw new SSLException("NPN/ALPN unsupported: " + nextProtocols); throw new SSLException("NPN/ALPN unsupported: " + nextProtocols);
} }
@ -118,6 +119,9 @@ public final class JdkSslClientContext extends JdkSslContext {
nextProtoList.add(p); nextProtoList.add(p);
} }
this.nextProtocols = Collections.unmodifiableList(nextProtoList); this.nextProtocols = Collections.unmodifiableList(nextProtoList);
} else {
this.nextProtocols = Collections.emptyList();
}
try { try {
if (certChainFile == null) { if (certChainFile == null) {