From 05fa5845bc26b1aa7b214a172080c00095092e7a Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Tue, 18 Jun 2019 21:14:04 -0700 Subject: [PATCH] Fix finalize of flux component Per patches from @SteVwonder and @garlick Signed-off-by: Ralph Castain (cherry picked from commit d4070d5f58f0c65aef89eea5910b202b8402e48b) --- opal/mca/pmix/flux/pmix_flux.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/opal/mca/pmix/flux/pmix_flux.c b/opal/mca/pmix/flux/pmix_flux.c index 187108bcc7..3233524e0f 100644 --- a/opal/mca/pmix/flux/pmix_flux.c +++ b/opal/mca/pmix/flux/pmix_flux.c @@ -1,6 +1,6 @@ /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* - * Copyright (c) 2014-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2014-2019 Intel, Inc. All rights reserved. * Copyright (c) 2014-2016 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2016 Cisco Systems, Inc. All rights reserved. @@ -373,6 +373,7 @@ static int flux_init(opal_list_t *ilist) char *str; if (0 < pmix_init_count) { + pmix_init_count++; return OPAL_SUCCESS; } @@ -585,11 +586,10 @@ static int flux_fini(void) { if (0 == --pmix_init_count) { PMI_Finalize (); + // teardown hash table + opal_pmix_base_hash_finalize(); } - // teardown hash table - opal_pmix_base_hash_finalize(); - return OPAL_SUCCESS; }