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

Fix NPE in OpenSslPrivateKeyMethodTest.destroy() when BoringSSL is not used

Browse Source 
Motivation:

4079189f6bd3e2c26ec443f24a204ffe144f1ada introduced OpenSslPrivateKeyMethodTest which will only be run when BoringSSL is used. As the assumeTrue(...) also guards the init of the static fields we need to ensure we only try to destroy these if BoringSSL is used as otherwise it will produce a NPE.

Modifications:

Check if BoringSSL is used before trying to destroy the resources.

Result:

No more NPE when BoringSSL is not used.
This commit is contained in:
Norman Maurer 2019-04-09 08:31:39 +02:00
parent 66f30874e3
commit 4eeaa4f956
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
handler/src/test/java/io/netty/handler/ssl/OpenSslPrivateKeyMethodTest.java
View File

@ -107,10 +107,12 @@ public class OpenSslPrivateKeyMethodTest {
@AfterClass @AfterClass
public static void destroy() { public static void destroy() {
if (OpenSsl.isBoringSSL()) {
GROUP.shutdownGracefully(); GROUP.shutdownGracefully();
CERT.delete(); CERT.delete();
EXECUTOR.shutdown(); EXECUTOR.shutdown();
} }
}
private final boolean delegate; private final boolean delegate;