aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2015-02-19 09:50:31 +0100
committerIngela Anderton Andin <[email protected]>2015-02-19 09:50:31 +0100
commit9e3299ca1b5d70562372a8eb51abf1cd96a284db (patch)
tree39091fb509da19663dc383a426ce6a8794291b70
parentf473c64efaf61cb89b35934725e14b5a026f264c (diff)
parent8ac0c3490a79dda2f6d9633af2f13e169f2084ea (diff)
downloadotp-9e3299ca1b5d70562372a8eb51abf1cd96a284db.tar.gz
otp-9e3299ca1b5d70562372a8eb51abf1cd96a284db.tar.bz2
otp-9e3299ca1b5d70562372a8eb51abf1cd96a284db.zip
Merge branch 'ia/ssl/delete-vs-remove' into maint
* ia/ssl/delete-vs-remove: ssl: remove -> delete
-rw-r--r--lib/ssl/src/ssl_manager.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl_manager.erl b/lib/ssl/src/ssl_manager.erl
index f2d82a66d3..c4f1f7f193 100644
--- a/lib/ssl/src/ssl_manager.erl
+++ b/lib/ssl/src/ssl_manager.erl
@@ -340,7 +340,7 @@ handle_info(validate_sessions, #state{session_cache_cb = CacheCb,
handle_info({delayed_clean_session, Key}, #state{session_cache = Cache,
session_cache_cb = CacheCb
} = State) ->
- CacheCb:remove(Cache, Key),
+ CacheCb:delete(Cache, Key),
{noreply, State};
handle_info(clear_pem_cache, #state{certificate_db = [_,_,PemChace],