Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

[simgrid.git] / src / smpi / smpi_deployment.c

diff --git a/src/smpi/smpi_deployment.c b/src/smpi/smpi_deployment.c
index 33177ac3339c1f2bf4a5ae3196b8f99e1b2b92d7..30df6113659500a0a4d800d79fd48c9ffe0f7be4 100644 (file)
--- a/src/smpi/smpi_deployment.c
+++ b/src/smpi/smpi_deployment.c
@@ -88,7 +88,8 @@ void smpi_deployment_cleanup_instances(){
   s_smpi_mpi_instance_t* instance = NULL;
   char *name = NULL;
   xbt_dict_foreach(smpi_instances, cursor, name, instance) {
-    while (smpi_group_unuse(smpi_comm_group(instance->comm_world)) > 0);
+    if(instance->comm_world!=MPI_COMM_NULL)
+      while (smpi_group_unuse(smpi_comm_group(instance->comm_world)) > 0);
     xbt_free(instance->comm_world);
     xbt_barrier_destroy(instance->finalization_barrier);
   }