diff options
author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2015-10-06 18:31:47 (GMT) |
---|---|---|
committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2015-10-06 18:31:47 (GMT) |
commit | 2ec9b447ec40c6a6486cbd2f577083fc905556fa (patch) | |
tree | 151498ddaec775d775b87d14515381351ec56f79 /src/H5.c | |
parent | d05369f41d078275b9f8879283ff9504a6a9f520 (diff) | |
parent | db00c23829fb80c35709be1b6de5781e51a134e0 (diff) | |
download | hdf5-2ec9b447ec40c6a6486cbd2f577083fc905556fa.zip hdf5-2ec9b447ec40c6a6486cbd2f577083fc905556fa.tar.gz hdf5-2ec9b447ec40c6a6486cbd2f577083fc905556fa.tar.bz2 |
[svn-r27972] merge from trunk.
Diffstat (limited to 'src/H5.c')
-rw-r--r-- | src/H5.c | 12 |
1 files changed, 8 insertions, 4 deletions
@@ -288,12 +288,12 @@ H5_term_library(void) n) : n)) do { - pending = 0; + pending = 0; /* Try to organize these so the "higher" level components get shut * down before "lower" level components that they might rely on. -QAK */ - pending += DOWN(L); + pending += DOWN(L); /* Close the "top" of various interfaces (IDs, etc) but don't shut * down the whole interface yet, so that the object header messages @@ -304,7 +304,7 @@ H5_term_library(void) pending += DOWN(A_top); pending += DOWN(D_top); pending += DOWN(G_top); - pending += DOWN(R_top); + pending += DOWN(R_top); pending += DOWN(S_top); pending += DOWN(T_top); @@ -312,6 +312,11 @@ H5_term_library(void) if(pending == 0) pending += DOWN(F); + /* Don't shut down the property list code until all objects that might + * use property lists are shut down */ + if(pending == 0) + pending += DOWN(P); + /* Wait to shut down the "bottom" of various interfaces until the * files are closed, so pieces of the file can be serialized * correctly. @@ -337,7 +342,6 @@ H5_term_library(void) if(pending == 0) { pending += DOWN(AC); pending += DOWN(Z); - pending += DOWN(P); pending += DOWN(FD); pending += DOWN(VL); pending += DOWN(PL); |