--- embedaddon/strongswan/src/libcharon/plugins/ha/ha_dispatcher.c	2020/06/03 09:46:45	1.1.1.1
+++ embedaddon/strongswan/src/libcharon/plugins/ha/ha_dispatcher.c	2021/03/17 00:20:09	1.1.1.2
@@ -259,7 +259,10 @@ static void process_ike_add(private_ha_dispatcher_t *t
 		if (ok)
 		{
 			if (old_sa)
-			{
+			{	/* register IKE_SA before calling inherit_post() so no scheduled
+				 * jobs are lost */
+				charon->ike_sa_manager->checkout_new(charon->ike_sa_manager,
+													 old_sa);
 				ike_sa->inherit_pre(ike_sa, old_sa);
 				ike_sa->inherit_post(ike_sa, old_sa);
 				charon->ike_sa_manager->checkin_and_destroy(