diff options
| author | Raimo Niskanen <[email protected]> | 2019-07-16 08:34:20 +0200 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2019-07-16 08:34:20 +0200 |
| commit | d12390859194e40e29e947bd7050ab8a775b352d (patch) | |
| tree | b6793bb843267b5e31377bdec4db9921cdb96935 /lib/ssl | |
| parent | 81d332cc693d2be8a5af16bfbcae0bfde6702479 (diff) | |
| parent | 86716445f382abad9b0af4e178ae526015ed074d (diff) | |
| download | otp-d12390859194e40e29e947bd7050ab8a775b352d.tar.gz otp-d12390859194e40e29e947bd7050ab8a775b352d.tar.bz2 otp-d12390859194e40e29e947bd7050ab8a775b352d.zip | |
Merge branch 'maint'
* maint:
Fix leaking SSL node
Diffstat (limited to 'lib/ssl')
| -rw-r--r-- | lib/ssl/test/ssl_dist_SUITE.erl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/ssl/test/ssl_dist_SUITE.erl b/lib/ssl/test/ssl_dist_SUITE.erl index 003e1fc448..7cfb2ac0c5 100644 --- a/lib/ssl/test/ssl_dist_SUITE.erl +++ b/lib/ssl/test/ssl_dist_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2007-2018. All Rights Reserved. +%% Copyright Ericsson AB 2007-2019. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -311,9 +311,11 @@ listen_port_options(Config) when is_list(Config) -> catch _:Reason -> stop_ssl_node(NH2), + stop_ssl_node(NH1), ct:fail(Reason) end, stop_ssl_node(NH2), + stop_ssl_node(NH1), success(Config). %%-------------------------------------------------------------------- |