Add explicit null checks in OpenSslX509KeyManagerFactory (#11230)

skyguard1 · web-flow · commit bb7b05be01b1 · 2021-05-07T11:22:27.000+02:00
Motivation:

We should add explicit null checks so its easier for people to understand why it throws.

Modification:

Add explicit checkNotNull(...)

Result:

Easier to understand for users why it fails.

Signed-off-by: xingrufei &lt;xingrufei@sogou-inc.com&gt;

Co-authored-by: xingrufei &lt;xingrufei@sogou-inc.com&gt;
diff --git a/handler/src/main/java/io/netty/handler/ssl/OpenSslX509KeyManagerFactory.java b/handler/src/main/java/io/netty/handler/ssl/OpenSslX509KeyManagerFactory.java
@@ -16,6 +16,7 @@
 package io.netty.handler.ssl;
 
 import static io.netty.util.internal.ObjectUtil.checkNonEmpty;
+import static io.netty.util.internal.ObjectUtil.checkNotNull;
 
 import io.netty.buffer.ByteBufAllocator;
 import io.netty.buffer.UnpooledByteBufAllocator;
@@ -254,6 +255,7 @@ public static OpenSslX509KeyManagerFactory newEngineBased(File certificateChain,
     public static OpenSslX509KeyManagerFactory newEngineBased(X509Certificate[] certificateChain, String password)
             throws CertificateException, IOException,
                    KeyStoreException, NoSuchAlgorithmException, UnrecoverableKeyException {
+        checkNotNull(certificateChain, "certificateChain");
         KeyStore store = new OpenSslKeyStore(certificateChain.clone(), false);
         store.load(null, null);
         OpenSslX509KeyManagerFactory factory = new OpenSslX509KeyManagerFactory();
@@ -286,6 +288,7 @@ public static OpenSslX509KeyManagerFactory newKeyless(InputStream chain)
     public static OpenSslX509KeyManagerFactory newKeyless(X509Certificate... certificateChain)
             throws CertificateException, IOException,
             KeyStoreException, NoSuchAlgorithmException, UnrecoverableKeyException {
+        checkNotNull(certificateChain, "certificateChain");
         KeyStore store = new OpenSslKeyStore(certificateChain.clone(), true);
         store.load(null, null);
         OpenSslX509KeyManagerFactory factory = new OpenSslX509KeyManagerFactory();
