2 files changed, 3 insertions, 3 deletions
diff --git a/src/H5HF.c b/src/H5HF.c
index 85018c4..9d8f01d 100644
--- a/src/H5HF.c
+++ b/src/H5HF.c
@@ -856,9 +856,6 @@ HDfprintf(stderr, "%s; After iterator reset fh->hdr->rc = %Zu\n", FUNC, fh->hdr-
         if(NULL == (hdr = H5HF_hdr_protect(fh->f, dxpl_id, heap_addr, H5AC_WRITE)))
             HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to protect fractal heap header")
 
-        /* Set the shared heap header's file context for this operation */
-        hdr->f = fh->f;
-
         /* Delete heap, starting with header (unprotects header) */
         if(H5HF_hdr_delete(hdr, dxpl_id) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTDELETE, FAIL, "unable to delete fractal heap")
diff --git a/src/H5HFhdr.c b/src/H5HFhdr.c
index e678d74..684c171 100644
--- a/src/H5HFhdr.c
+++ b/src/H5HFhdr.c
@@ -552,6 +552,9 @@ H5HF_hdr_protect(H5F_t *f, hid_t dxpl_id, haddr_t addr, H5AC_protect_t rw)
     /* Set the header's address */
     hdr->heap_addr = addr;
 
+    /* Update header's file pointer */
+    hdr->f = f;
+
     /* Set the return value */
     ret_value = hdr;