Merge pull request #1392 from rhc54/topic/dvm

rhc54 · rhc54 · commit 1df4457af29e · 2016-02-21T17:42:48.000-08:00
Tools don't create the orte_job_data table, so don't remove jobs from it
diff --git a/orte/runtime/orte_globals.c b/orte/runtime/orte_globals.c
@@ -717,7 +717,7 @@ static void orte_job_destruct(orte_job_t* job)
     /* release the attributes */
     OPAL_LIST_DESTRUCT(&job->attributes);
 
-    if (ORTE_JOBID_INVALID != job->jobid) {
+    if (NULL != orte_job_data && ORTE_JOBID_INVALID != job->jobid) {
         /* remove the job from the global array */
         opal_hash_table_remove_value_uint32(orte_job_data, job->jobid);
     }

Original file line number	Diff line number	Diff line change
`@@ -717,7 +717,7 @@ static void orte_job_destruct(orte_job_t* job)`
`717`	`717`	`/* release the attributes */`
`718`	`718`	`OPAL_LIST_DESTRUCT(&job->attributes);`
`719`	`719`
`720`		`- if (ORTE_JOBID_INVALID != job->jobid) {`
	`720`	`+ if (NULL != orte_job_data && ORTE_JOBID_INVALID != job->jobid) {`
`721`	`721`	`/* remove the job from the global array */`
`722`	`722`	`opal_hash_table_remove_value_uint32(orte_job_data, job->jobid);`
`723`	`723`	`}`