From 27690912612449079c36fea7ca77886cbd3c5b86 Mon Sep 17 00:00:00 2001 From: Josh Hursey Date: Wed, 23 Sep 2009 13:26:48 +0000 Subject: [PATCH] Fix for the stalled scenario in which 'options' might be reset to NULL inadvertently. Thanks to MTT for picking this up. This commit was SVN r22002. --- orte/mca/snapc/full/snapc_full_app.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/orte/mca/snapc/full/snapc_full_app.c b/orte/mca/snapc/full/snapc_full_app.c index a2b6b374d4..3a11969b54 100644 --- a/orte/mca/snapc/full/snapc_full_app.c +++ b/orte/mca/snapc/full/snapc_full_app.c @@ -179,17 +179,19 @@ static void snapc_full_app_signal_handler (int signo) */ int snapc_full_app_notify_response(opal_cr_ckpt_cmd_state_t resp) { - opal_crs_base_ckpt_options_t *options = NULL; + static opal_crs_base_ckpt_options_t *options = NULL; static int cr_state; int app_pid; int ret, exit_status = ORTE_SUCCESS; + if( NULL == options ) { + options = OBJ_NEW(opal_crs_base_ckpt_options_t); + } + if( opal_cr_currently_stalled ) { goto STAGE_1; } - options = OBJ_NEW(opal_crs_base_ckpt_options_t); - OPAL_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, "App) notify_response: Stage 1...")); if( ORTE_SUCCESS != (ret = app_notify_resp_stage_1(resp, options) ) ) {