summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2017-01-26 16:05:34 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2017-01-26 16:05:34 (GMT)
commitc4c1ce8cc32aa9428dfb8a0d73bb4bffb7ae682d (patch)
tree0b652e6e83aded1bfb10ead58c3550b057766944
parentd627cd29bd6e7fec75bc96b265ceab2e940ef99e (diff)
parent05ea6be738343a94f7e2871920b27c0fb4435bc5 (diff)
downloadhdf5-c4c1ce8cc32aa9428dfb8a0d73bb4bffb7ae682d.zip
hdf5-c4c1ce8cc32aa9428dfb8a0d73bb4bffb7ae682d.tar.gz
hdf5-c4c1ce8cc32aa9428dfb8a0d73bb4bffb7ae682d.tar.bz2
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '05ea6be738343a94f7e2871920b27c0fb4435bc5': Commit Vailin's fix for the h5format_convert test failure. DAILYTEST-256 #2.
-rw-r--r--src/H5C.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/H5C.c b/src/H5C.c
index 4adee6d..22cb0df 100644
--- a/src/H5C.c
+++ b/src/H5C.c
@@ -1594,6 +1594,11 @@ done:
HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "an extreme sanity check failed on exit.\n")
#endif /* H5C_DO_EXTREME_SANITY_CHECKS */
+ if(ret_value < 0 && entry_ptr->tag_info) {
+ if(H5C__untag_entry(cache_ptr, entry_ptr) < 0)
+ HDONE_ERROR(H5E_CACHE, H5E_CANTREMOVE, FAIL, "can't remove entry from tag list")
+ }
+
FUNC_LEAVE_NOAPI(ret_value)
} /* H5C_insert_entry() */