Merge pull request #6732 from dmitrygladkov/topic/pml/ucx_init

PML/UCX: Don't destroy UCP worker if it wasn't created

Author: yosefe

ompi/mca/pml/ucx/pml_ucx.c

@@ -314,8 +314,8 @@ int mca_pml_ucx_init(int enable_mpi_threads)
 
 err_destroy_worker:
     ucp_worker_destroy(ompi_pml_ucx.ucp_worker);
-    ompi_pml_ucx.ucp_worker = NULL;
 err:
+    ompi_pml_ucx.ucp_worker = NULL;
     return rc;
 }
 
@@ -345,7 +345,7 @@ int mca_pml_ucx_cleanup(void)
     OBJ_DESTRUCT(&ompi_pml_ucx.convs);
     OBJ_DESTRUCT(&ompi_pml_ucx.persistent_reqs);
 
-    if (ompi_pml_ucx.ucp_worker) {
+    if (ompi_pml_ucx.ucp_worker != NULL) {
         ucp_worker_destroy(ompi_pml_ucx.ucp_worker);
         ompi_pml_ucx.ucp_worker = NULL;
     }