From 9c69900bbcb0e3b52a00a3f1539412425dfea3ea Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Fri, 23 Apr 2010 15:14:21 +0000 Subject: [PATCH] Ensure we get the jdata object when updating proc state so we don't segv if report-progress is set. Thanks to Sam for reporting it! This commit was SVN r23029. --- orte/mca/plm/base/plm_base_receive.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/orte/mca/plm/base/plm_base_receive.c b/orte/mca/plm/base/plm_base_receive.c index 6a383be1f4..bd2eabc151 100644 --- a/orte/mca/plm/base/plm_base_receive.c +++ b/orte/mca/plm/base/plm_base_receive.c @@ -337,6 +337,11 @@ static void process_msg(int fd, short event, void *data) name.jobid = job; running = true; + /* get the job object */ + if (NULL == (jdata = orte_get_job_data_object(job))) { + ORTE_ERROR_LOG(ORTE_ERR_NOT_FOUND); + goto CLEANUP; + } /* if we are timing, the daemon will have included the time it * recvd the launch msg - the maximum time between when we sent * that message and a daemon recvd it tells us the time reqd @@ -344,11 +349,6 @@ static void process_msg(int fd, short event, void *data) */ if (orte_timing) { int64_t tmpsec, tmpusec; - /* get the job object */ - if (NULL == (jdata = orte_get_job_data_object(name.jobid))) { - ORTE_ERROR_LOG(ORTE_ERR_NOT_FOUND); - goto CLEANUP; - } count = 1; if (ORTE_SUCCESS != (rc = opal_dss.unpack(msgpkt->buffer, &tmpsec, &count, OPAL_INT64))) { ORTE_ERROR_LOG(rc);