Resolve merge conflicts
This commit is contained in:
@@ -51,7 +51,7 @@ static inline void free_evicted_sessions(struct session_manager *sess_mgr, uint6
|
||||
if (sess)
|
||||
{
|
||||
plugin_ctx = session_get_user_data(sess);
|
||||
plugin_manager_session_runtime_free((struct plugin_manager_runtime*)plugin_ctx);
|
||||
plugin_manager_session_runtime_free((struct plugin_manager_runtime *)plugin_ctx);
|
||||
session_manager_free_session(sess_mgr, sess);
|
||||
}
|
||||
else
|
||||
@@ -71,7 +71,7 @@ static inline void free_expired_sessions(struct session_manager *sess_mgr, uint6
|
||||
if (sess)
|
||||
{
|
||||
plugin_ctx = session_get_user_data(sess);
|
||||
plugin_manager_session_runtime_free((struct plugin_manager_runtime*)plugin_ctx);
|
||||
plugin_manager_session_runtime_free((struct plugin_manager_runtime *)plugin_ctx);
|
||||
session_manager_free_session(sess_mgr, sess);
|
||||
}
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user