[svn-r28708] Description:

    Fix earray, farray and btree2 use of incorrect file pointer when two files
are opened and used to access the data structure.  Misc. minor code cleanups
as well.

Tested on:
    MacOSX/64 10.11.2 (amazon) w/serial & parallel
    (h5committest not required on this branch)

14 files changed, 699 insertions, 268 deletions

diff --git a/src/H5B2.c b/src/H5B2.c
index 84ff8de..5225d56 100644
--- a/src/H5B2.c
+++ b/src/H5B2.c
@@ -139,7 +139,6 @@ H5B2_create(H5F_t *f, hid_t dxpl_id, const H5B2_create_t *cparam,
 {
     H5B2_t      *bt2 = NULL;            /* Pointer to the B-tree */
     H5B2_hdr_t  *hdr = NULL;            /* Pointer to the B-tree header */
-    H5B2_hdr_cache_ud_t cache_udata;    /* User-data for callback */
     haddr_t     hdr_addr;               /* B-tree header address */
     H5B2_t      *ret_value = NULL;      /* Return value */
 
@@ -163,12 +162,8 @@ H5B2_create(H5F_t *f, hid_t dxpl_id, const H5B2_create_t *cparam,
         HGOTO_ERROR(H5E_BTREE, H5E_CANTALLOC, NULL, "memory allocation failed for v2 B-tree info")
 
     /* Look up the B-tree header */
-    cache_udata.f = f;
-    cache_udata.parent = parent;
-    cache_udata.addr = hdr_addr;
-    cache_udata.ctx_udata = ctx_udata;
-    if(NULL == (hdr = (H5B2_hdr_t *)H5AC_protect(f, dxpl_id, H5AC_BT2_HDR, hdr_addr, &cache_udata, H5AC__NO_FLAGS_SET)))
-        HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, NULL, "unable to load B-tree header")
+    if(NULL == (hdr = H5B2__hdr_protect(f, dxpl_id, hdr_addr, ctx_udata, parent, H5AC__NO_FLAGS_SET)))
+        HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, NULL, "unable to protect v2 B-tree header")
 
     /* Point v2 B-tree wrapper at header and bump it's ref count */
     bt2->hdr = hdr;
@@ -186,7 +181,7 @@ H5B2_create(H5F_t *f, hid_t dxpl_id, const H5B2_create_t *cparam,
     ret_value = bt2;
 
 done:
-    if(hdr && H5AC_unprotect(f, dxpl_id, H5AC_BT2_HDR, hdr_addr, hdr, H5AC__NO_FLAGS_SET) < 0)
+    if(hdr && H5B2__hdr_unprotect(hdr, dxpl_id, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, NULL, "unable to release v2 B-tree header")
     if(!ret_value && bt2)
         if(H5B2_close(bt2, dxpl_id) < 0)
@@ -215,7 +210,6 @@ H5B2_open(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *ctx_udata, void *parent)
 {
     H5B2_t	*bt2 = NULL;            /* Pointer to the B-tree */
     H5B2_hdr_t	*hdr = NULL;            /* Pointer to the B-tree header */
-    H5B2_hdr_cache_ud_t cache_udata;    /* User-data for callback */
     H5B2_t	*ret_value = NULL;      /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
@@ -225,12 +219,8 @@ H5B2_open(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *ctx_udata, void *parent)
     HDassert(H5F_addr_defined(addr));
 
     /* Look up the B-tree header */
-    cache_udata.f = f;
-    cache_udata.parent = parent;
-    cache_udata.addr = addr;
-    cache_udata.ctx_udata = ctx_udata;
-    if(NULL == (hdr = (H5B2_hdr_t *)H5AC_protect(f, dxpl_id, H5AC_BT2_HDR, addr, &cache_udata, H5AC__READ_ONLY_FLAG)))
-	HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, NULL, "unable to load B-tree header")
+    if(NULL == (hdr = H5B2__hdr_protect(f, dxpl_id, addr, ctx_udata, parent, H5AC__READ_ONLY_FLAG)))
+	HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, NULL, "unable to protect v2 B-tree header")
 
     /* Check for pending heap deletion */
     if(hdr->pending_delete)
@@ -256,7 +246,7 @@ H5B2_open(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *ctx_udata, void *parent)
     ret_value = bt2;
 
 done:
-    if(hdr && H5AC_unprotect(f, dxpl_id, H5AC_BT2_HDR, addr, hdr, H5AC__NO_FLAGS_SET) < 0)
+    if(hdr && H5B2__hdr_unprotect(hdr, dxpl_id, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, NULL, "unable to release v2 B-tree header")
     if(!ret_value && bt2)
         if(H5B2_close(bt2, dxpl_id) < 0)
@@ -1388,7 +1378,7 @@ H5B2_close(H5B2_t *bt2, hid_t dxpl_id)
 
         /* Lock the v2 B-tree header into memory */
         /* (OK to pass in NULL for callback context, since we know the header must be in the cache) */
-        if(NULL == (hdr = (H5B2_hdr_t *)H5AC_protect(bt2->f, dxpl_id, H5AC_BT2_HDR, bt2_addr, NULL, H5AC__NO_FLAGS_SET)))
+        if(NULL == (hdr = H5B2__hdr_protect(bt2->f, dxpl_id, bt2_addr, NULL, NULL, H5AC__NO_FLAGS_SET)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to protect v2 B-tree header")
 
         /* Set the shared v2 B-tree header's file context for this operation */
@@ -1450,7 +1440,6 @@ H5B2_delete(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *ctx_udata,
     void *parent, H5B2_remove_t op, void *op_data)
 {
     H5B2_hdr_t	*hdr = NULL;            /* Pointer to the B-tree header */
-    H5B2_hdr_cache_ud_t cache_udata;    /* User-data for callback */
     herr_t	ret_value = SUCCEED;    /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
@@ -1463,11 +1452,7 @@ H5B2_delete(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *ctx_udata,
 #ifdef QAK
 HDfprintf(stderr, "%s: addr = %a\n", FUNC, addr);
 #endif /* QAK */
-    cache_udata.f = f;
-    cache_udata.parent = parent;
-    cache_udata.addr = addr;
-    cache_udata.ctx_udata = ctx_udata;
-    if(NULL == (hdr = (H5B2_hdr_t *)H5AC_protect(f, dxpl_id, H5AC_BT2_HDR, addr, &cache_udata, H5AC__NO_FLAGS_SET)))
+    if(NULL == (hdr = H5B2__hdr_protect(f, dxpl_id, addr, ctx_udata, parent, H5AC__NO_FLAGS_SET)))
         HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to protect v2 B-tree header")
 
     /* Remember the callback & context for later */
@@ -1489,7 +1474,7 @@ HDfprintf(stderr, "%s: addr = %a\n", FUNC, addr);
 
 done:
     /* Unprotect the header, if an error occurred */
-    if(hdr && H5AC_unprotect(f, dxpl_id, H5AC_BT2_HDR, addr, hdr, H5AC__NO_FLAGS_SET) < 0)
+    if(hdr && H5B2__hdr_unprotect(hdr, dxpl_id, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release v2 B-tree header")
 
     FUNC_LEAVE_NOAPI(ret_value)
diff --git a/src/H5B2dbg.c b/src/H5B2dbg.c
index c7dc165..05fa1d8 100644
--- a/src/H5B2dbg.c
+++ b/src/H5B2dbg.c
@@ -95,7 +95,6 @@ H5B2__hdr_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent,
     void        *dbg_ctx = NULL;	/* v2 B-tree debugging context */
     unsigned    u;                      /* Local index variable */
     char        temp_str[128];          /* Temporary string, for formatting */
-    H5B2_hdr_cache_ud_t cache_udata;    /* User-data for callback */
     herr_t      ret_value = SUCCEED;    /* Return value */
 
     FUNC_ENTER_PACKAGE
@@ -114,20 +113,13 @@ H5B2__hdr_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent,
         (NULL == type->crt_dbg_ctx && NULL == type->dst_dbg_ctx));
 
     /* Check for debugging context callback available */
-    if(type->crt_dbg_ctx) {
+    if(type->crt_dbg_ctx)
         /* Create debugging context */
         if(NULL == (dbg_ctx = (type->crt_dbg_ctx)(f, dxpl_id, obj_addr)))
 	    HGOTO_ERROR(H5E_BTREE, H5E_CANTGET, FAIL, "unable to create v2 B-tree debugging context")
-    } /* end if */
 
-    /*
-     * Load the B-tree header.
-     */
-    cache_udata.f = f;
-    cache_udata.addr = addr;
-    cache_udata.ctx_udata = dbg_ctx;
-    cache_udata.parent = NULL;
-    if(NULL == (hdr = (H5B2_hdr_t *)H5AC_protect(f, dxpl_id, H5AC_BT2_HDR, addr, &cache_udata, H5AC__READ_ONLY_FLAG)))
+    /* Load the B-tree header  */
+    if(NULL == (hdr = H5B2__hdr_protect(f, dxpl_id, addr, dbg_ctx, NULL, H5AC__READ_ONLY_FLAG)))
 	HGOTO_ERROR(H5E_BTREE, H5E_CANTLOAD, FAIL, "unable to load B-tree header")
 
     /* Set file pointer for this B-tree operation */
@@ -181,11 +173,8 @@ H5B2__hdr_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent,
 done:
     if(dbg_ctx && (type->dst_dbg_ctx)(dbg_ctx) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_CANTRELEASE, FAIL, "unable to release v2 B-tree debugging context")
-    if(hdr) {
-        hdr->f = NULL;
-        if(H5AC_unprotect(f, dxpl_id, H5AC_BT2_HDR, addr, hdr, H5AC__NO_FLAGS_SET) < 0)
-            HDONE_ERROR(H5E_BTREE, H5E_PROTECT, FAIL, "unable to release B-tree header")
-    } /* end if */
+    if(hdr && H5B2__hdr_unprotect(hdr, dxpl_id, H5AC__NO_FLAGS_SET) < 0)
+        HDONE_ERROR(H5E_BTREE, H5E_PROTECT, FAIL, "unable to release v2 B-tree header")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5B2__hdr_debug() */
@@ -213,7 +202,6 @@ H5B2__int_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent,
     void        *dbg_ctx = NULL;	/* v2 B-tree debugging context */
     unsigned	u;                      /* Local index variable */
     char        temp_str[128];          /* Temporary string, for formatting */
-    H5B2_hdr_cache_ud_t cache_udata;    /* User-data for callback */
     herr_t      ret_value=SUCCEED;      /* Return value */
 
     FUNC_ENTER_PACKAGE
@@ -240,15 +228,9 @@ H5B2__int_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent,
 	    HGOTO_ERROR(H5E_BTREE, H5E_CANTGET, FAIL, "unable to create v2 B-tree debugging context")
     } /* end if */
 
-    /*
-     * Load the B-tree header.
-     */
-    cache_udata.f = f;
-    cache_udata.addr = hdr_addr;
-    cache_udata.ctx_udata = dbg_ctx;
-    cache_udata.parent = NULL;
-    if(NULL == (hdr = (H5B2_hdr_t *)H5AC_protect(f, dxpl_id, H5AC_BT2_HDR, hdr_addr, &cache_udata, H5AC__READ_ONLY_FLAG)))
-	HGOTO_ERROR(H5E_BTREE, H5E_CANTLOAD, FAIL, "unable to load B-tree header")
+    /* Load the B-tree header */
+    if(NULL == (hdr = H5B2__hdr_protect(f, dxpl_id, hdr_addr, dbg_ctx, NULL, H5AC__READ_ONLY_FLAG)))
+	HGOTO_ERROR(H5E_BTREE, H5E_CANTLOAD, FAIL, "unable to load v2 B-tree header")
 
     /* Set file pointer for this B-tree operation */
     hdr->f = f;
@@ -311,11 +293,8 @@ H5B2__int_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent,
 done:
     if(dbg_ctx && (type->dst_dbg_ctx)(dbg_ctx) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_CANTRELEASE, FAIL, "unable to release v2 B-tree debugging context")
-    if(hdr) {
-        hdr->f = NULL;
-        if(H5AC_unprotect(f, dxpl_id, H5AC_BT2_HDR, hdr_addr, hdr, H5AC__NO_FLAGS_SET) < 0)
-            HDONE_ERROR(H5E_BTREE, H5E_PROTECT, FAIL, "unable to release B-tree header")
-    } /* end if */
+    if(hdr && H5B2__hdr_unprotect(hdr, dxpl_id, H5AC__NO_FLAGS_SET) < 0)
+        HDONE_ERROR(H5E_BTREE, H5E_PROTECT, FAIL, "unable to release v2 B-tree header")
     if(internal && H5AC_unprotect(f, dxpl_id, H5AC_BT2_INT, addr, internal, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_PROTECT, FAIL, "unable to release B-tree internal node")
 
@@ -342,7 +321,6 @@ H5B2__leaf_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent
 {
     H5B2_hdr_t	*hdr = NULL;            /* B-tree header */
     H5B2_leaf_t	*leaf = NULL;           /* B-tree leaf node */
-    H5B2_hdr_cache_ud_t cache_udata;    /* User-data for callback */
     void        *dbg_ctx = NULL;	/* v2 B-tree debugging context */
     unsigned	u;                      /* Local index variable */
     char        temp_str[128];          /* Temporary string, for formatting */
@@ -366,21 +344,14 @@ H5B2__leaf_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent
     HDassert(nrec > 0);
 
     /* Check for debugging context callback available */
-    if(type->crt_dbg_ctx) {
+    if(type->crt_dbg_ctx)
         /* Create debugging context */
         if(NULL == (dbg_ctx = (type->crt_dbg_ctx)(f, dxpl_id, obj_addr)))
 	    HGOTO_ERROR(H5E_BTREE, H5E_CANTGET, FAIL, "unable to create v2 B-tree debugging context")
-    } /* end if */
 
-    /*
-     * Load the B-tree header.
-     */
-    cache_udata.f = f;
-    cache_udata.addr = hdr_addr;
-    cache_udata.ctx_udata = dbg_ctx;
-    cache_udata.parent = NULL;
-    if(NULL == (hdr = (H5B2_hdr_t *)H5AC_protect(f, dxpl_id, H5AC_BT2_HDR, hdr_addr, &cache_udata, H5AC__READ_ONLY_FLAG)))
-	HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to protect B-tree header")
+    /* Load the B-tree header */
+    if(NULL == (hdr = H5B2__hdr_protect(f, dxpl_id, hdr_addr, dbg_ctx, NULL, H5AC__READ_ONLY_FLAG)))
+	HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to protect v2 B-tree header")
 
     /* Set file pointer for this B-tree operation */
     hdr->f = f;
@@ -426,11 +397,8 @@ H5B2__leaf_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent
 done:
     if(dbg_ctx && (type->dst_dbg_ctx)(dbg_ctx) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_CANTRELEASE, FAIL, "unable to release v2 B-tree debugging context")
-    if(hdr) {
-        hdr->f = NULL;
-        if(H5AC_unprotect(f, dxpl_id, H5AC_BT2_HDR, hdr_addr, hdr, H5AC__NO_FLAGS_SET) < 0)
-            HDONE_ERROR(H5E_BTREE, H5E_PROTECT, FAIL, "unable to release B-tree header")
-    } /* end if */
+    if(hdr && H5B2__hdr_unprotect(hdr, dxpl_id, H5AC__NO_FLAGS_SET) < 0)
+        HDONE_ERROR(H5E_BTREE, H5E_PROTECT, FAIL, "unable to release B-tree header")
     if(leaf && H5AC_unprotect(f, dxpl_id, H5AC_BT2_LEAF, addr, leaf, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_PROTECT, FAIL, "unable to release B-tree leaf node")
 
diff --git a/src/H5B2hdr.c b/src/H5B2hdr.c
index f3945bc..c91723d 100644
--- a/src/H5B2hdr.c
+++ b/src/H5B2hdr.c
@@ -220,10 +220,9 @@ HDmemset(hdr->page, 0, hdr->node_size);
     hdr->shadowed_internal = NULL;
 
     /* Create the callback context, if the callback exists */
-    if(hdr->cls->crt_context) {
+    if(hdr->cls->crt_context)
         if(NULL == (hdr->cb_ctx = (*hdr->cls->crt_context)(ctx_udata)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTCREATE, FAIL, "unable to create v2 B-tree client callback context")
-    } /* end if */
 
 done:
     if(ret_value < 0)
@@ -499,6 +498,83 @@ done:
 
 
 /*-------------------------------------------------------------------------
+ * Function:	H5B2__hdr_protect
+ *
+ * Purpose:	Convenience wrapper around protecting v2 B-tree header
+ *
+ * Return:	Non-NULL pointer to header on success/NULL on failure
+ *
+ * Programmer:	Quincey Koziol
+ *		koziol@hdfgroup.org
+ *		Dec 18 2015
+ *
+ *-------------------------------------------------------------------------
+ */
+H5B2_hdr_t *
+H5B2__hdr_protect(H5F_t *f, hid_t dxpl_id, haddr_t hdr_addr, void *ctx_udata,
+    void *parent, unsigned flags)
+{
+    H5B2_hdr_cache_ud_t udata;          /* User data for cache callbacks */
+    H5B2_hdr_t *ret_value = NULL;       /* Return value */
+
+    FUNC_ENTER_PACKAGE
+
+    /* Sanity check */
+    HDassert(f);
+    HDassert(H5F_addr_defined(hdr_addr));
+
+    /* only the H5AC__READ_ONLY_FLAG may appear in flags */
+    HDassert((flags & (unsigned)(~H5AC__READ_ONLY_FLAG)) == 0);
+
+    /* Set up user data for cache callbacks */
+    udata.f = f;
+    udata.parent = parent;
+    udata.addr = hdr_addr;
+    udata.ctx_udata = ctx_udata;
+
+    /* Protect the header */
+    if(NULL == (ret_value = (H5B2_hdr_t *)H5AC_protect(f, dxpl_id, H5AC_BT2_HDR, hdr_addr, &udata, flags)))
+        HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, NULL, "unable to load v2 B-tree header, address = %llu", (unsigned long long)hdr_addr)
+    ret_value->f = f;   /* (Must be set again here, in case the header was already in the cache -QAK) */
+
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5B2__hdr_protect() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5B2__hdr_unprotect
+ *
+ * Purpose:	Convenience wrapper around unprotecting v2 B-tree header
+ *
+ * Return:	Non-negative on success/Negative on failure
+ *
+ * Programmer:	Quincey Koziol
+ *		koziol@hdfgroup.org
+ *		Dec 18 2015
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5B2__hdr_unprotect(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned cache_flags)
+{
+    herr_t ret_value = SUCCEED;         /* Return value */
+
+    FUNC_ENTER_PACKAGE
+
+    /* Sanity check */
+    HDassert(hdr);
+
+    /* Unprotect the header */
+    if(H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_HDR, hdr->addr, hdr, cache_flags) < 0)
+        HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to unprotect v2 B-tree header, address = %llu", (unsigned long long)hdr->addr)
+
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5B2__hdr_unprotect() */
+
+
+/*-------------------------------------------------------------------------
  * Function:	H5B2__hdr_free
  *
  * Purpose:	Free B-tree header info
@@ -620,8 +696,8 @@ H5B2__hdr_delete(H5B2_hdr_t *hdr, hid_t dxpl_id)
 
 done:
     /* Unprotect the header with appropriate flags */
-    if(H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_HDR, hdr->addr, hdr, cache_flags) < 0)
-        HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree header")
+    if(H5B2__hdr_unprotect(hdr, dxpl_id, cache_flags) < 0)
+        HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release v2 B-tree header")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5B2__hdr_delete() */
diff --git a/src/H5B2pkg.h b/src/H5B2pkg.h
index 834ef3d..6124ec4 100644
--- a/src/H5B2pkg.h
+++ b/src/H5B2pkg.h
@@ -321,6 +321,10 @@ H5_DLL herr_t H5B2__hdr_decr(H5B2_hdr_t *hdr);
 H5_DLL herr_t H5B2__hdr_fuse_incr(H5B2_hdr_t *hdr);
 H5_DLL size_t H5B2__hdr_fuse_decr(H5B2_hdr_t *hdr);
 H5_DLL herr_t H5B2__hdr_dirty(H5B2_hdr_t *hdr);
+H5_DLL H5B2_hdr_t *H5B2__hdr_protect(H5F_t *f, hid_t dxpl_id, haddr_t hdr_addr,
+    void *ctx_udata, void *parent, unsigned flags);
+H5_DLL herr_t H5B2__hdr_unprotect(H5B2_hdr_t *hdr, hid_t dxpl_id,
+    unsigned cache_flags);
 H5_DLL herr_t H5B2__hdr_delete(H5B2_hdr_t *hdr, hid_t dxpl_id);
 
 /* Routines for operating on leaf nodes */
diff --git a/src/H5B2test.c b/src/H5B2test.c
index 654659b..a72dc30 100644
--- a/src/H5B2test.c
+++ b/src/H5B2test.c
@@ -67,8 +67,8 @@ static herr_t H5B2__test_store(void *nrecord, const void *udata);
 static herr_t H5B2__test_compare(const void *rec1, const void *rec2);
 static herr_t H5B2__test_encode(uint8_t *raw, const void *nrecord, void *ctx);
 static herr_t H5B2__test_decode(const uint8_t *raw, void *nrecord, void *ctx);
-static herr_t H5B2__test_debug(FILE *stream, const H5F_t *f, hid_t dxpl_id,
-    int indent, int fwidth, const void *record, const void *_udata);
+static herr_t H5B2__test_debug(FILE *stream, int indent, int fwidth,
+    const void *record, const void *_udata);
 static void *H5B2__test_crt_dbg_context(H5F_t *f, hid_t dxpl_id, haddr_t addr);
 
 
@@ -295,8 +295,7 @@ H5B2__test_decode(const uint8_t *raw, void *nrecord, void *_ctx)
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5B2__test_debug(FILE *stream, const H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id,
-    int indent, int fwidth, const void *record,
+H5B2__test_debug(FILE *stream, int indent, int fwidth, const void *record,
     const void H5_ATTR_UNUSED *_udata)
 {
     FUNC_ENTER_STATIC_NOERR
diff --git a/src/H5C.c b/src/H5C.c
index 448e6fe..5c3d9ef 100644
--- a/src/H5C.c
+++ b/src/H5C.c
@@ -3428,7 +3428,7 @@ done:
          ( H5C_validate_pinned_entry_list(cache_ptr) < 0 ) ||
          ( H5C_validate_lru_list(cache_ptr) < 0 ) ) {
 
-        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
+        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, NULL, \
                     "an extreme sanity check failed on exit.\n");
     }
 #endif /* H5C_DO_EXTREME_SANITY_CHECKS */
@@ -7610,8 +7610,8 @@ H5C_flush_ring(H5F_t *f, hid_t dxpl_id, H5C_ring_t ring,  unsigned flags)
 
 #if H5C_DO_EXTREME_SANITY_CHECKS
     if((H5C_validate_protected_entry_list(cache_ptr) < 0) ||
-            (H5C_validate_pinned_entry_list(cache_ptr) < 0  ||
-            (H5C_validate_lru_list(cache_ptr) < 0)) {
+            (H5C_validate_pinned_entry_list(cache_ptr) < 0) ||
+            (H5C_validate_lru_list(cache_ptr) < 0))
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "an extreme sanity check failed on entry.\n");
 #endif /* H5C_DO_EXTREME_SANITY_CHECKS */
 
@@ -9439,10 +9439,8 @@ H5C_validate_lru_list(H5C_t * cache_ptr)
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Check 1 failed")
     }
 
-    if ( ( cache_ptr->LRU_list_len < 0 ) || ( cache_ptr->LRU_list_size < 0 ) ) {
-
+    if(cache_ptr->LRU_list_len < 0)
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Check 2 failed")
-    }
 
     if ( ( cache_ptr->LRU_list_len == 1 )
          &&
@@ -9569,10 +9567,8 @@ H5C_validate_pinned_entry_list(H5C_t * cache_ptr)
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Check 1 failed")
     }
 
-    if ( ( cache_ptr->pel_len < 0 ) || ( cache_ptr->pel_size < 0 ) ) {
-
+    if(cache_ptr->pel_len < 0)
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Check 2 failed")
-    }
 
     if ( ( cache_ptr->pel_len == 1 )
          &&
@@ -9692,21 +9688,12 @@ H5C_validate_protected_entry_list(H5C_t * cache_ptr)
     HDassert( cache_ptr );
     HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
 
-    if ( ( ( cache_ptr->pl_head_ptr == NULL )
-           ||
-           ( cache_ptr->pl_tail_ptr == NULL )
-         )
-         &&
-         ( cache_ptr->pl_head_ptr != cache_ptr->pl_tail_ptr )
-       ) {
-
+    if(((cache_ptr->pl_head_ptr == NULL) || (cache_ptr->pl_tail_ptr == NULL))
+             && (cache_ptr->pl_head_ptr != cache_ptr->pl_tail_ptr))
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Check 1 failed")
-    }
-
-    if ( ( cache_ptr->pl_len < 0 ) || ( cache_ptr->pl_size < 0 ) ) {
 
+    if(cache_ptr->pl_len < 0)
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Check 2 failed")
-    }
 
     if ( ( cache_ptr->pl_len == 1 )
          &&
diff --git a/src/H5EAhdr.c b/src/H5EAhdr.c
index e60f804..46224f6 100644
--- a/src/H5EAhdr.c
+++ b/src/H5EAhdr.c
@@ -43,7 +43,7 @@
 #include "H5Eprivate.h"		/* Error handling		  	*/
 #include "H5EApkg.h"		/* Extensible Arrays			*/
 #include "H5MFprivate.h"	/* File memory management		*/
-#include "H5VMprivate.h"		/* Vectors and arrays 			*/
+#include "H5VMprivate.h"	/* Vectors and arrays 			*/
 
 
 /****************/
@@ -619,7 +619,7 @@ END_FUNC(PKG)   /* end H5EA__hdr_modified() */
  *
  * Purpose:	Convenience wrapper around protecting extensible array header
  *
- * Return:	Non-NULL pointer to index block on success/NULL on failure
+ * Return:	Non-NULL pointer to header on success/NULL on failure
  *
  * Programmer:	Quincey Koziol
  *		koziol@hdfgroup.org
@@ -650,6 +650,7 @@ H5EA__hdr_protect(H5F_t *f, hid_t dxpl_id, haddr_t ea_addr, void *ctx_udata,
     /* Protect the header */
     if(NULL == (ret_value = (H5EA_hdr_t *)H5AC_protect(f, dxpl_id, H5AC_EARRAY_HDR, ea_addr, &udata, flags)))
         H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array header, address = %llu", (unsigned long long)ea_addr)
+    ret_value->f = f;   /* (Must be set again here, in case the header was already in the cache -QAK) */
 
 CATCH
 
diff --git a/src/H5FAhdr.c b/src/H5FAhdr.c
index 3acf807..a71d92e 100644
--- a/src/H5FAhdr.c
+++ b/src/H5FAhdr.c
@@ -400,7 +400,7 @@ END_FUNC(PKG)   /* end H5FA__hdr_modified() */
  *
  * Purpose:	Convenience wrapper around protecting fixed array header
  *
- * Return:	Non-NULL pointer to index block on success/NULL on failure
+ * Return:	Non-NULL pointer to header on success/NULL on failure
  *
  * Programmer:	Quincey Koziol
  *		koziol@hdfgroup.org
@@ -431,6 +431,7 @@ H5FA__hdr_protect(H5F_t *f, hid_t dxpl_id, haddr_t fa_addr, void *ctx_udata,
     /* Protect the header */
     if(NULL == (ret_value = (H5FA_hdr_t *)H5AC_protect(f, dxpl_id, H5AC_FARRAY_HDR, fa_addr, &udata, flags)))
         H5E_THROW(H5E_CANTPROTECT, "unable to protect fixed array header, address = %llu", (unsigned long long)fa_addr)
+    ret_value->f = f;   /* (Must be set again here, in case the header was already in the cache -QAK) */
 
 CATCH
 
diff --git a/src/H5Fint.c b/src/H5Fint.c
index e163103..b6cc1f1 100644
--- a/src/H5Fint.c
+++ b/src/H5Fint.c
@@ -1141,12 +1141,11 @@ H5F_open(const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id,
 
             if(NULL == (lf = H5FD_open(name, flags, fapl_id, HADDR_UNDEF)))
                 HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "unable to open file")
-
         } /* end if */
 
-	/* Place an advisory lock on the file */
+	/* Place an advisory lock on the file & create the 'top' file structure */
         if((H5FD_lock(lf, (hbool_t)((flags & H5F_ACC_RDWR) ? TRUE : FALSE)) < 0) ||
-           (NULL == (file = H5F_new(NULL, flags, fcpl_id, fapl_id, lf)))) {
+                (NULL == (file = H5F_new(NULL, flags, fcpl_id, fapl_id, lf)))) {
             if(H5FD_close(lf) < 0) /* Closing will remove the lock */
                 HDONE_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "unable to close low-level file info")
             HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "unable to lock the file or initialize file structure")
diff --git a/test/Makefile.am b/test/Makefile.am
index 59ba43b..cef7c75 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -51,17 +51,14 @@ check_SCRIPTS = $(TEST_SCRIPT)
 # executed, generally most specific tests to least specific tests.
 # As an exception, long-running tests should occur earlier in the list.
 # This gives them more time to run when tests are executing in parallel.
-# These tests (fheap, btree2) are under development and are not used by
-# the library yet. Move them to the end so that their failure do not block
-# other current library code tests.
-TEST_PROG= testhdf5 lheap ohdr stab gheap cache cache_api cache_tagging \
+TEST_PROG= testhdf5 cache cache_api cache_tagging lheap ohdr stab gheap \
+           farray earray btree2 fheap \
            pool accum hyperslab istore bittests dt_arith \
            dtypes dsets cmpd_dset filter_fail extend external efc objcopy links unlink \
            twriteorder big mtime fillval mount flush1 flush2 app_ref enum \
            set_extent ttsafe enc_dec_plist enc_dec_plist_cross_platform\
            getname vfd ntypes dangle dtransform reserved cross_read \
-           freespace mf vds farray earray btree2 fheap file_image unregister \
-           cache_logging cork swmr
+           freespace mf vds file_image unregister cache_logging cork swmr
 
 # List programs to be built when testing here.
 # error_test and err_compat are built at the same time as the other tests, but executed by testerror.sh.
@@ -174,9 +171,9 @@ CHECK_CLEANFILES+=accum.h5 cmpd_dset.h5 compact_dataset.h5 dataset.h5 \
     multi_file-[rs].h5 core_file plugin.h5 \
     new_move_[ab].h5 ntypes.h5 dangle.h5 error_test.h5 err_compat.h5 \
     dtransform.h5 test_filters.h5 get_file_name.h5 tstint[1-2].h5    \
-    unlink_chunked.h5 btree2.h5 objcopy_src.h5 objcopy_dst.h5        \
-    objcopy_ext.dat trefer1.h5 trefer2.h5 app_ref.h5 farray.h5       \
-    earray.h5 efc[0-5].h5 log_vfd_out.log                            \
+    unlink_chunked.h5 btree2.h5 btree2_tmp.h5 objcopy_src.h5 objcopy_dst.h5 \
+    objcopy_ext.dat trefer1.h5 trefer2.h5 app_ref.h5 farray.h5 farray_tmp.h5 \
+    earray.h5 earray_tmp.h5 efc[0-5].h5 log_vfd_out.log              \
     new_multi_file_v16-r.h5 new_multi_file_v16-s.h5                  \
     split_get_file_image_test-m.h5 split_get_file_image_test-r.h5    \
     file_image_core_test.h5.copy unregister_filter_1.h5 unregister_filter_2.h5 \
diff --git a/test/btree2.c b/test/btree2.c
index 83c079b..c367779 100644
--- a/test/btree2.c
+++ b/test/btree2.c
@@ -31,6 +31,7 @@
 
 const char *FILENAME[] = {
     "btree2",
+    "btree2_tmp",
     NULL
 };
 
@@ -108,9 +109,8 @@ create_file(hid_t *file, H5F_t **f, hid_t fapl)
         STACK_ERROR
 
     /* Ignore metadata tags in the file's cache */
-    if(H5AC_ignore_tags(*f) < 0) {
+    if(H5AC_ignore_tags(*f) < 0)
         STACK_ERROR
-    }
 
     /* Success */
     return(0);
@@ -2810,9 +2810,8 @@ HDfprintf(stderr,"curr_time=%lu\n",(unsigned long)curr_time);
         STACK_ERROR
 
     /* Ignore metadata tags in the file's cache */
-    if(H5AC_ignore_tags(f) < 0) {
+    if(H5AC_ignore_tags(f) < 0)
         STACK_ERROR
-    }
 
     /* Create the v2 B-tree & get its address */
     if(create_btree(f, dxpl, cparam, &bt2, &bt2_addr) < 0)
@@ -2849,9 +2848,8 @@ HDfprintf(stderr,"curr_time=%lu\n",(unsigned long)curr_time);
         FAIL_STACK_ERROR
 
     /* Ignore metadata tags in the file's cache */
-    if(H5AC_ignore_tags(f) < 0) {
+    if(H5AC_ignore_tags(f) < 0)
         STACK_ERROR
-    }
 
     /* Re-open v2 B-tree */
     if(NULL == (bt2 = H5B2_open(f, dxpl, bt2_addr, f, NULL)))
@@ -4909,7 +4907,7 @@ test_remove_level1_collapse(hid_t fapl, const H5B2_create_t *cparam,
 
     /* Check record values in root of B-tree */
     ninfo.depth = 0;
-    ninfo.nrec = INSERT_SPLIT_ROOT_NREC - u;
+    ninfo.nrec = (uint16_t)(INSERT_SPLIT_ROOT_NREC - u);
     record = 31;      /* Middle record in root node */
     if(check_node_info(bt2, dxpl, record, &ninfo) < 0)
         TEST_ERROR
@@ -6379,9 +6377,8 @@ gen_l4_btree2(const char *filename, hid_t fapl, const H5B2_create_t *cparam,
         STACK_ERROR
 
     /* Ignore metadata tags in the file's cache */
-    if(H5AC_ignore_tags(f) < 0) {
+    if(H5AC_ignore_tags(f) < 0)
         STACK_ERROR
-    }
 
     /* Create the v2 B-tree & get its address */
     if(create_btree(f, dxpl, cparam, &bt2, bt2_addr) < 0)
@@ -6535,9 +6532,8 @@ HDfprintf(stderr, "curr_time = %lu\n", (unsigned long)curr_time);
         FAIL_STACK_ERROR
 
     /* Ignore metadata tags in the file's cache */
-    if(H5AC_ignore_tags(f) < 0) {
+    if(H5AC_ignore_tags(f) < 0)
         STACK_ERROR
-    }
 
     /* Re-shuffle record #'s */
     for(u = 0; u < INSERT_MANY; u++) {
@@ -6631,9 +6627,8 @@ HDfprintf(stderr, "curr_time = %lu\n", (unsigned long)curr_time);
         FAIL_STACK_ERROR
 
     /* Ignore metadata tags in the file's cache */
-    if(H5AC_ignore_tags(f) < 0) {
+    if(H5AC_ignore_tags(f) < 0)
         STACK_ERROR
-    }
 
     /* Re-open v2 B-tree */
     if(NULL == (bt2 = H5B2_open(f, dxpl, bt2_addr, f, NULL)))
@@ -6720,9 +6715,8 @@ HDfprintf(stderr, "curr_time = %lu\n", (unsigned long)curr_time);
         FAIL_STACK_ERROR
 
     /* Ignore metadata tags in the file's cache */
-    if(H5AC_ignore_tags(f) < 0) {
+    if(H5AC_ignore_tags(f) < 0)
         STACK_ERROR
-    }
 
     /* Re-open v2 B-tree */
     if(NULL == (bt2 = H5B2_open(f, dxpl, bt2_addr, f, NULL)))
@@ -6806,9 +6800,8 @@ HDfprintf(stderr, "curr_time = %lu\n", (unsigned long)curr_time);
         FAIL_STACK_ERROR
 
     /* Ignore metadata tags in the file's cache */
-    if(H5AC_ignore_tags(f) < 0) {
+    if(H5AC_ignore_tags(f) < 0)
         STACK_ERROR
-    }
 
     /* Re-open v2 B-tree */
     if(NULL == (bt2 = H5B2_open(f, dxpl, bt2_addr, f, NULL)))
@@ -7157,9 +7150,8 @@ test_delete(hid_t fapl, const H5B2_create_t *cparam)
         STACK_ERROR
 
     /* Ignore metadata tags in the file's cache */
-    if(H5AC_ignore_tags(f) < 0) {
+    if(H5AC_ignore_tags(f) < 0)
         STACK_ERROR
-    }
 
     /* Create the v2 B-tree & get its address */
     if(create_btree(f, dxpl, cparam, &bt2, &bt2_addr) < 0)
@@ -7202,9 +7194,8 @@ test_delete(hid_t fapl, const H5B2_create_t *cparam)
         STACK_ERROR
 
     /* Ignore metadata tags in the file's cache */
-    if(H5AC_ignore_tags(f) < 0) {
+    if(H5AC_ignore_tags(f) < 0)
         STACK_ERROR
-    }
 
     /* Create the v2 B-tree & get its address */
     if(create_btree(f, dxpl, cparam, &bt2, &bt2_addr) < 0)
@@ -7260,9 +7251,8 @@ test_delete(hid_t fapl, const H5B2_create_t *cparam)
         STACK_ERROR
 
     /* Ignore metadata tags in the file's cache */
-    if(H5AC_ignore_tags(f) < 0) {
+    if(H5AC_ignore_tags(f) < 0)
         STACK_ERROR
-    }
 
     /* Create the v2 B-tree & get its address */
     if(create_btree(f, dxpl, cparam, &bt2, &bt2_addr) < 0)
@@ -7318,9 +7308,8 @@ test_delete(hid_t fapl, const H5B2_create_t *cparam)
         STACK_ERROR
 
     /* Ignore metadata tags in the file's cache */
-    if(H5AC_ignore_tags(f) < 0) {
+    if(H5AC_ignore_tags(f) < 0)
         STACK_ERROR
-    }
 
     /* Create the v2 B-tree & get its address */
     if(create_btree(f, dxpl, cparam, &bt2, &bt2_addr) < 0)
@@ -7605,6 +7594,146 @@ error:
 
 
 /*-------------------------------------------------------------------------
+ * Function:	test_open_twice_diff
+ *
+ * Purpose:	Open a v2 B-tree twice, through different "top" file
+ *              handles, with an intermediate file open that takes the "shared"
+ *              file handle from the first B-tree's file pointer.
+ *
+ * Return:	Success:	0
+ *		Failure:	1
+ *
+ * Programmer:	Quincey Koziol
+ *              Friday, December 18, 2015
+ *
+ *-------------------------------------------------------------------------
+ */
+static unsigned
+test_open_twice_diff(hid_t fapl, const H5B2_create_t *cparam)
+{
+    char	filename[1024];         /* Filename to use */
+    char        filename_tmp[1024];     /* Temporary file name */
+    hid_t	file = -1;              /* File ID */
+    hid_t	file2 = -1;             /* File ID */
+    hid_t	file0 = -1;             /* File ID */
+    hid_t	file00 = -1;            /* File ID */
+    H5F_t	*f = NULL;              /* Internal file object pointer */
+    H5F_t	*f2 = NULL;             /* Internal file object pointer */
+    hid_t       dxpl = H5P_DATASET_XFER_DEFAULT;        /* DXPL to use */
+    H5B2_t      *bt2 = NULL;            /* v2 B-tree wrapper */
+    H5B2_t      *bt2_2 = NULL;          /* Second v2 B-tree wrapper */
+    haddr_t     bt2_addr;               /* Address of B-tree created */
+
+    h5_fixname(FILENAME[0], fapl, filename, sizeof filename);
+
+    /*
+     * Display testing message
+     */
+    TESTING("open B-tree twice, through different file handles");
+
+    /* Create the file to work on */
+    if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
+        FAIL_STACK_ERROR
+
+    /* Get a pointer to the internal file object */
+    if(NULL == (f = (H5F_t *)H5I_object(file)))
+        FAIL_STACK_ERROR
+
+    /* Ignore metadata tags in the file's cache */
+    if(H5AC_ignore_tags(f) < 0)
+        FAIL_STACK_ERROR
+
+    /* Create the v2 B-tree & get its address */
+    if(create_btree(f, dxpl, cparam, &bt2, &bt2_addr) < 0)
+        TEST_ERROR
+
+    /* Re-open v2 B-tree */
+    if(NULL == (bt2_2 = H5B2_open(f, dxpl, bt2_addr, f, NULL)))
+        FAIL_STACK_ERROR
+
+    /* Close the second v2 B-tree wrapper */
+    if(H5B2_close(bt2_2, dxpl) < 0)
+        FAIL_STACK_ERROR
+    bt2_2 = NULL;
+
+    /* Re-open the file */
+    /* (So that there is something holding the file open when the extensible
+     *  array is closed)
+     */
+    if((file0 = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0)
+        FAIL_STACK_ERROR
+
+    /* Close the first v2 B-tree wrapper */
+    if(H5B2_close(bt2, dxpl) < 0)
+        FAIL_STACK_ERROR
+    bt2 = NULL;
+
+    /* Close the file */
+    /* (close before second file, to detect error on internal B-tree header's
+     *  shared file information)
+     */
+    if(H5Fclose(file) < 0)
+        FAIL_STACK_ERROR
+    file = -1;
+
+    /* Open a different file */
+    /* (This re-allocates the 'top' file pointer and assigns it a different
+     *  'shared' file pointer, making the file pointer in the fixed array's
+     *  header stale)
+     */
+    h5_fixname(FILENAME[1], fapl, filename_tmp, sizeof(filename_tmp));
+    if((file00 = H5Fcreate(filename_tmp, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
+        FAIL_STACK_ERROR
+
+    /* Re-open the file with the v2 B-tree array */
+    if((file2 = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0)
+        FAIL_STACK_ERROR
+
+    /* Get a pointer to the internal file object */
+    if(NULL == (f2 = (H5F_t *)H5I_object(file2)))
+        FAIL_STACK_ERROR
+
+    /* Open the B-tree through the second file handle */
+    if(NULL == (bt2_2 = H5B2_open(f2, dxpl, bt2_addr, f2, NULL)))
+        FAIL_STACK_ERROR
+
+    /* Close the extra file handles */
+    if(H5Fclose(file0) < 0)
+        FAIL_STACK_ERROR
+    if(H5Fclose(file00) < 0)
+        FAIL_STACK_ERROR
+
+    /* Close the second v2 B-tree */
+    if(H5B2_close(bt2_2, dxpl) < 0)
+        FAIL_STACK_ERROR
+    bt2_2 = NULL;
+
+    /* Close file */
+    if(H5Fclose(file2) < 0)
+        FAIL_STACK_ERROR
+
+    /* All tests passed */
+    PASSED();
+
+    /* All tests passed */
+    return(0);
+
+error:
+    H5E_BEGIN_TRY {
+        if(bt2)
+            H5B2_close(bt2, dxpl);
+        if(bt2)
+            H5B2_close(bt2_2, dxpl);
+	H5Fclose(file);
+	H5Fclose(file2);
+	H5Fclose(file0);
+	H5Fclose(file00);
+    } H5E_END_TRY;
+    return(1);
+} /* test_open_twice_diff() */
+
+
+/*-------------------------------------------------------------------------
  * Function:	main
  *
  * Purpose:	Test the B-tree v2 code
@@ -7712,6 +7841,9 @@ main(void)
         nerrors += test_modify(fapl, &cparam, &tparam);
     } /* end for */
 
+    /* Test opening B-trees twice */
+    nerrors += test_open_twice_diff(fapl, &cparam);
+
     /* Verify symbol table messages are cached */
     nerrors += (h5_verify_cached_stabs(FILENAME, fapl) < 0 ? 1 : 0);
 
diff --git a/test/dsets.c b/test/dsets.c
index 9775214..4b7123d 100644
--- a/test/dsets.c
+++ b/test/dsets.c
@@ -10069,6 +10069,80 @@ error:
 
 
 /*-------------------------------------------------------------------------
+ * Function: test_zero_dim_dset
+ *
+ * Purpose:     Tests support for reading a 1D chunled dataset with 
+ *              dimension size = 0.
+ *
+ * Return:      Success: 0
+ *              Failure: -1
+ *
+ * Programmer:  Mohamad Chaarawi
+ *              Wednesdat, July 9, 2014
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+test_zero_dim_dset(hid_t fapl)
+{
+    char        filename[FILENAME_BUF_SIZE];
+    hid_t       fid = -1;       /* File ID */
+    hid_t       dcpl = -1;      /* Dataset creation property list ID */
+    hid_t       sid = -1;       /* Dataspace ID */
+    hid_t       dsid = -1;      /* Dataset ID */
+    hsize_t     dim, chunk_dim; /* Dataset and chunk dimensions */
+    int         data[1];
+
+    TESTING("shrinking large chunk");
+
+    h5_fixname(FILENAME[16], fapl, filename, sizeof filename);
+
+    /* Create file */
+    if((fid = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) FAIL_STACK_ERROR
+
+    /* Create dataset creation property list */
+    if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0) FAIL_STACK_ERROR
+
+    /* Set 1 chunk size */
+    chunk_dim = 1;
+    if(H5Pset_chunk(dcpl, 1, &chunk_dim) < 0) FAIL_STACK_ERROR
+
+    /* Create 1D dataspace with 0 dim size */
+    dim = 0;
+    if((sid = H5Screate_simple(1, &dim, NULL)) < 0) FAIL_STACK_ERROR
+
+    /* Create chunked dataset */
+    if((dsid = H5Dcreate2(fid, "dset", H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
+        FAIL_STACK_ERROR
+
+    /* write 0 elements from dataset */
+    if(H5Dwrite(dsid, H5T_NATIVE_INT, sid, sid, H5P_DEFAULT, data) < 0) FAIL_STACK_ERROR
+
+    /* Read 0 elements from dataset */
+    if(H5Dread(dsid, H5T_NATIVE_INT, sid, sid, H5P_DEFAULT, data) < 0) FAIL_STACK_ERROR
+
+    /* Close everything */
+    if(H5Sclose(sid) < 0) FAIL_STACK_ERROR
+    if(H5Dclose(dsid) < 0) FAIL_STACK_ERROR
+    if(H5Pclose(dcpl) < 0) FAIL_STACK_ERROR
+    if(H5Fclose(fid) < 0) FAIL_STACK_ERROR
+
+    PASSED();
+
+    return 0;
+
+error:
+    H5E_BEGIN_TRY {
+        H5Pclose(dcpl);
+        H5Dclose(dsid);
+        H5Sclose(sid);
+        H5Fclose(fid);
+    } H5E_END_TRY;
+    return -1;
+} /* end test_zero_dim_dset() */
+
+
+/*-------------------------------------------------------------------------
  * Function: test_swmr_non_latest
  *
  * Purpose: Checks that a file created with either:
@@ -10672,80 +10746,6 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * Function: test_zero_dim_dset
- *
- * Purpose:     Tests support for reading a 1D chunled dataset with 
- *              dimension size = 0.
- *
- * Return:      Success: 0
- *              Failure: -1
- *
- * Programmer:  Mohamad Chaarawi
- *              Wednesdat, July 9, 2014
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-test_zero_dim_dset(hid_t fapl)
-{
-    char        filename[FILENAME_BUF_SIZE];
-    hid_t       fid = -1;       /* File ID */
-    hid_t       dcpl = -1;      /* Dataset creation property list ID */
-    hid_t       sid = -1;       /* Dataspace ID */
-    hid_t       dsid = -1;      /* Dataset ID */
-    hsize_t     dim, chunk_dim; /* Dataset and chunk dimensions */
-    int         data[1];
-
-    TESTING("shrinking large chunk");
-
-    h5_fixname(FILENAME[16], fapl, filename, sizeof filename);
-
-    /* Create file */
-    if((fid = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) FAIL_STACK_ERROR
-
-    /* Create dataset creation property list */
-    if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0) FAIL_STACK_ERROR
-
-    /* Set 1 chunk size */
-    chunk_dim = 1;
-    if(H5Pset_chunk(dcpl, 1, &chunk_dim) < 0) FAIL_STACK_ERROR
-
-    /* Create 1D dataspace with 0 dim size */
-    dim = 0;
-    if((sid = H5Screate_simple(1, &dim, NULL)) < 0) FAIL_STACK_ERROR
-
-    /* Create chunked dataset */
-    if((dsid = H5Dcreate2(fid, "dset", H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
-        FAIL_STACK_ERROR
-
-    /* write 0 elements from dataset */
-    if(H5Dwrite(dsid, H5T_NATIVE_INT, sid, sid, H5P_DEFAULT, data) < 0) FAIL_STACK_ERROR
-
-    /* Read 0 elements from dataset */
-    if(H5Dread(dsid, H5T_NATIVE_INT, sid, sid, H5P_DEFAULT, data) < 0) FAIL_STACK_ERROR
-
-    /* Close everything */
-    if(H5Sclose(sid) < 0) FAIL_STACK_ERROR
-    if(H5Dclose(dsid) < 0) FAIL_STACK_ERROR
-    if(H5Pclose(dcpl) < 0) FAIL_STACK_ERROR
-    if(H5Fclose(fid) < 0) FAIL_STACK_ERROR
-
-    PASSED();
-
-    return 0;
-
-error:
-    H5E_BEGIN_TRY {
-        H5Pclose(dcpl);
-        H5Dclose(dsid);
-        H5Sclose(sid);
-        H5Fclose(fid);
-    } H5E_END_TRY;
-    return -1;
-} /* end test_zero_dim_dset() */
-
-
-/*-------------------------------------------------------------------------
  * Function:    test_scatter
  *
  * Purpose:     Tests H5Dscatter with a variety of different selections
@@ -11851,38 +11851,38 @@ main(void)
         nerrors += (test_simple_io(envval, my_fapl) < 0		? 1 : 0);
         nerrors += (test_compact_io(my_fapl) < 0  		? 1 : 0);
         nerrors += (test_max_compact(my_fapl) < 0  		? 1 : 0);
-        nerrors += (test_conv_buffer(file) < 0		? 1 : 0);
+        nerrors += (test_conv_buffer(file) < 0		        ? 1 : 0);
         nerrors += (test_tconv(file) < 0			? 1 : 0);
         nerrors += (test_filters(file, my_fapl) < 0		? 1 : 0);
         nerrors += (test_onebyte_shuffle(file) < 0 		? 1 : 0);
-        nerrors += (test_nbit_int(file) < 0 		? 1 : 0);
-        nerrors += (test_nbit_float(file) < 0         	? 1 : 0);
-        nerrors += (test_nbit_double(file) < 0         	? 1 : 0);
-        nerrors += (test_nbit_array(file) < 0 		? 1 : 0);
+        nerrors += (test_nbit_int(file) < 0 		        ? 1 : 0);
+        nerrors += (test_nbit_float(file) < 0         	        ? 1 : 0);
+        nerrors += (test_nbit_double(file) < 0         	        ? 1 : 0);
+        nerrors += (test_nbit_array(file) < 0 		        ? 1 : 0);
         nerrors += (test_nbit_compound(file) < 0 		? 1 : 0);
         nerrors += (test_nbit_compound_2(file) < 0 		? 1 : 0);
         nerrors += (test_nbit_compound_3(file) < 0 		? 1 : 0);
         nerrors += (test_nbit_int_size(file) < 0 		? 1 : 0);
         nerrors += (test_nbit_flt_size(file) < 0 		? 1 : 0);
         nerrors += (test_scaleoffset_int(file) < 0 		? 1 : 0);
-        nerrors += (test_scaleoffset_int_2(file) < 0 	? 1 : 0);
-        nerrors += (test_scaleoffset_float(file) < 0 	? 1 : 0);
-        nerrors += (test_scaleoffset_float_2(file) < 0 	? 1 : 0);
-        nerrors += (test_scaleoffset_double(file) < 0 	? 1 : 0);
+        nerrors += (test_scaleoffset_int_2(file) < 0 	        ? 1 : 0);
+        nerrors += (test_scaleoffset_float(file) < 0 	        ? 1 : 0);
+        nerrors += (test_scaleoffset_float_2(file) < 0 	        ? 1 : 0);
+        nerrors += (test_scaleoffset_double(file) < 0 	        ? 1 : 0);
         nerrors += (test_scaleoffset_double_2(file) < 0 	? 1 : 0);
-        nerrors += (test_multiopen (file) < 0		? 1 : 0);
-        nerrors += (test_types(file) < 0       		? 1 : 0);
-        nerrors += (test_userblock_offset(envval, my_fapl) < 0     	? 1 : 0);
+        nerrors += (test_multiopen (file) < 0		        ? 1 : 0);
+        nerrors += (test_types(file) < 0       		        ? 1 : 0);
+        nerrors += (test_userblock_offset(envval, my_fapl) < 0  ? 1 : 0);
         nerrors += (test_missing_filter(file) < 0		? 1 : 0);
-        nerrors += (test_can_apply(file) < 0		? 1 : 0);
-        nerrors += (test_can_apply2(file) < 0		? 1 : 0);
-        nerrors += (test_set_local(my_fapl) < 0		? 1 : 0);
+        nerrors += (test_can_apply(file) < 0		        ? 1 : 0);
+        nerrors += (test_can_apply2(file) < 0		        ? 1 : 0);
+        nerrors += (test_set_local(my_fapl) < 0		        ? 1 : 0);
         nerrors += (test_can_apply_szip(file) < 0		? 1 : 0);
-        nerrors += (test_compare_dcpl(file) < 0		? 1 : 0);
-        nerrors += (test_copy_dcpl(file, my_fapl) < 0	? 1 : 0);
+        nerrors += (test_compare_dcpl(file) < 0		        ? 1 : 0);
+        nerrors += (test_copy_dcpl(file, my_fapl) < 0	        ? 1 : 0);
         nerrors += (test_filter_delete(file) < 0		? 1 : 0);
-        nerrors += (test_filters_endianess() < 0	? 1 : 0);
-        nerrors += (test_zero_dims(file) < 0		? 1 : 0);
+        nerrors += (test_filters_endianess() < 0	        ? 1 : 0);
+        nerrors += (test_zero_dims(file) < 0		        ? 1 : 0);
         nerrors += (test_missing_chunk(file) < 0		? 1 : 0);
         nerrors += (test_random_chunks(my_fapl) < 0		? 1 : 0);
 #ifndef H5_NO_DEPRECATED_SYMBOLS
@@ -11902,10 +11902,10 @@ main(void)
         nerrors += (test_single_chunk(my_fapl) < 0              ? 1 : 0);	
         nerrors += (test_large_chunk_shrink(my_fapl) < 0        ? 1 : 0);
         nerrors += (test_zero_dim_dset(my_fapl) < 0             ? 1 : 0);
-        nerrors += (test_swmr_non_latest(envval, my_fapl) < 0 ? 1 : 0);
-        nerrors += (test_earray_hdr_fd(envval, my_fapl) < 0 ? 1 : 0);
-        nerrors += (test_farray_hdr_fd(envval, my_fapl) < 0 ? 1 : 0);
-        nerrors += (test_bt2_hdr_fd(envval, my_fapl) < 0 ? 1 : 0);
+        nerrors += (test_swmr_non_latest(envval, my_fapl) < 0   ? 1 : 0);
+        nerrors += (test_earray_hdr_fd(envval, my_fapl) < 0     ? 1 : 0);
+        nerrors += (test_farray_hdr_fd(envval, my_fapl) < 0     ? 1 : 0);
+        nerrors += (test_bt2_hdr_fd(envval, my_fapl) < 0        ? 1 : 0);
 
         if(H5Fclose(file) < 0)
             goto error;
diff --git a/test/earray.c b/test/earray.c
index 3bd46e8..1753104 100644
--- a/test/earray.c
+++ b/test/earray.c
@@ -185,6 +185,7 @@ static herr_t earray_cache_test_free_icr(void *thing);
 /* Local variables */
 const char *FILENAME[] = {
     "earray",
+    "earray_tmp",
     NULL
 };
 
@@ -344,9 +345,8 @@ create_file(unsigned flags, hid_t fapl, hid_t *file, H5F_t **f)
         FAIL_STACK_ERROR
 
     /* Ignore metadata tags in the file's cache */
-    if(H5AC_ignore_tags(*f) < 0) {
+    if(H5AC_ignore_tags(*f) < 0)
         FAIL_STACK_ERROR
-    }
 
     /* Success */
     return(0);
@@ -455,17 +455,19 @@ reopen_file(hid_t *file, H5F_t **f, hid_t fapl, hid_t dxpl,
     /* (actually will close & re-open the file as well) */
     if(tparam->reopen_array) {
         /* Close array, if given */
-        if(ea) {
+        if(ea && *ea) {
             if(H5EA_close(*ea, dxpl) < 0)
                 FAIL_STACK_ERROR
             *ea = NULL;
         } /* end if */
 
         /* Close file */
-        if(H5Fclose(*file) < 0)
-            FAIL_STACK_ERROR
-        *file = (-1);
-        *f = NULL;
+        if(*file) {
+            if(H5Fclose(*file) < 0)
+                FAIL_STACK_ERROR
+            *file = (-1);
+            *f = NULL;
+        } /* end if */
 
         /* Re-open the file */
         if((*file = H5Fopen(filename_g, H5F_ACC_RDWR, fapl)) < 0)
@@ -476,15 +478,13 @@ reopen_file(hid_t *file, H5F_t **f, hid_t fapl, hid_t dxpl,
             FAIL_STACK_ERROR
 
         /* Ignore metadata tags in the file's cache */
-        if(H5AC_ignore_tags(*f) < 0) {
+        if(H5AC_ignore_tags(*f) < 0)
             FAIL_STACK_ERROR
-        }
 
         /* Re-open array, if given */
-        if(ea) {
+        if(ea)
             if(NULL == (*ea = H5EA_open(*f, dxpl, ea_addr, NULL)))
                 FAIL_STACK_ERROR
-        } /* end if */
     } /* end if */
 
     /* Success */
@@ -1009,7 +1009,7 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSE
     /* Set invalid max. # of elements per data block page bits */
     if(test_cparam.idx_blk_elmts > 0) {
         HDmemcpy(&test_cparam, cparam, sizeof(test_cparam));
-        test_cparam.max_dblk_page_nelmts_bits = H5VM_log2_gen((uint64_t)test_cparam.idx_blk_elmts) - 1;
+        test_cparam.max_dblk_page_nelmts_bits = (uint8_t)(H5VM_log2_gen((uint64_t)test_cparam.idx_blk_elmts) - 1);
         H5E_BEGIN_TRY {
             ea = H5EA_create(f, H5P_DATASET_XFER_DEFAULT, &test_cparam, NULL);
         } H5E_END_TRY;
@@ -1036,7 +1036,7 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSE
         TEST_ERROR
     } /* end if */
     HDmemcpy(&test_cparam, cparam, sizeof(test_cparam));
-    test_cparam.max_dblk_page_nelmts_bits = test_cparam.max_nelmts_bits + 1;
+    test_cparam.max_dblk_page_nelmts_bits = (uint8_t)(test_cparam.max_nelmts_bits + 1);
     H5E_BEGIN_TRY {
         ea = H5EA_create(f, H5P_DATASET_XFER_DEFAULT, &test_cparam, NULL);
     } H5E_END_TRY;
@@ -1272,6 +1272,148 @@ error:
 
 
 /*-------------------------------------------------------------------------
+ * Function:	test_open_twice_diff
+ *
+ * Purpose:	Open an extensible array twice, through different "top" file
+ *              handles, with an intermediate file open that takes the "shared"
+ *              file handle from the first extensible array's file pointer.
+ *
+ * Return:	Success:	0
+ *		Failure:	1
+ *
+ * Programmer:	Quincey Koziol
+ *              Friday, December 18, 2015
+ *
+ *-------------------------------------------------------------------------
+ */
+static unsigned
+test_open_twice_diff(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tparam)
+{
+    char        filename_tmp[EARRAY_FILENAME_LEN];      /* Temporary file name */
+    hid_t	file = -1;              /* File ID */
+    hid_t	file2 = -1;             /* File ID */
+    hid_t	file0 = -1;             /* File ID */
+    hid_t	file00 = -1;            /* File ID */
+    H5F_t	*f = NULL;              /* Internal file object pointer */
+    H5F_t	*f2 = NULL;             /* Internal file object pointer */
+    H5EA_t      *ea = NULL;             /* Extensible array wrapper */
+    H5EA_t      *ea2 = NULL;            /* Extensible array wrapper */
+    haddr_t     ea_addr = HADDR_UNDEF;  /* Array address in file */
+
+    /* Create file & retrieve pointer to internal file object */
+    if(create_file(H5F_ACC_TRUNC, fapl, &file, &f) < 0)
+        TEST_ERROR
+
+    /*
+     * Display testing message
+     */
+    TESTING("open extensible array twice, through different file handles");
+
+    /* Create array */
+    if(create_array(f, H5P_DATASET_XFER_DEFAULT, cparam, &ea, &ea_addr, NULL) < 0)
+        TEST_ERROR
+
+    /* Open the array again, through the first file handle */
+    if(NULL == (ea2 = H5EA_open(f, H5P_DATASET_XFER_DEFAULT, ea_addr, NULL)))
+        FAIL_STACK_ERROR
+
+    /* Verify the creation parameters */
+    if(verify_cparam(ea, cparam) < 0)
+        TEST_ERROR
+    if(verify_cparam(ea2, cparam) < 0)
+        TEST_ERROR
+
+    /* Close the second extensible array wrapper */
+    if(H5EA_close(ea2, H5P_DATASET_XFER_DEFAULT) < 0)
+        FAIL_STACK_ERROR
+    ea2 = NULL;
+
+    /* Re-open the file */
+    /* (So that there is something holding the file open when the extensible
+     *  array is closed)
+     */
+    if((file0 = H5Fopen(filename_g, H5F_ACC_RDWR, fapl)) < 0)
+        FAIL_STACK_ERROR
+
+    /* Check for closing & re-opening the file */
+    if(reopen_file(&file, &f, fapl, H5P_DATASET_XFER_DEFAULT, &ea, ea_addr, tparam) < 0)
+        TEST_ERROR
+
+    /* Verify the creation parameters */
+    if(verify_cparam(ea, cparam) < 0)
+        TEST_ERROR
+
+    /* Close the first extensible array wrapper */
+    if(H5EA_close(ea, H5P_DATASET_XFER_DEFAULT) < 0)
+        FAIL_STACK_ERROR
+    ea = NULL;
+
+    /* Close the first file */
+    /* (close before second file, to detect error on internal array header's
+     *  shared file information)
+     */
+    if(H5Fclose(file) < 0)
+        FAIL_STACK_ERROR
+    file = -1;
+
+    /* Open a different file */
+    /* (This re-allocates the 'top' file pointer and assigns it a different
+     *  'shared' file pointer, making the file pointer in the extensible array's
+     *  header stale)
+     */
+    h5_fixname(FILENAME[1], fapl, filename_tmp, sizeof(filename_tmp));
+    if((file00 = H5Fcreate(filename_tmp, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
+        FAIL_STACK_ERROR
+
+
+    /* Re-open the file with the extensible array */
+    if((file2 = H5Fopen(filename_g, H5F_ACC_RDWR, fapl)) < 0)
+        FAIL_STACK_ERROR
+
+    /* Get a pointer to the internal file object */
+    if(NULL == (f2 = (H5F_t *)H5I_object(file2)))
+        FAIL_STACK_ERROR
+
+    /* Open the extensible array through the second file handle */
+    if(NULL == (ea2 = H5EA_open(f2, H5P_DATASET_XFER_DEFAULT, ea_addr, NULL)))
+        FAIL_STACK_ERROR
+
+    /* Verify the creation parameters */
+    if(verify_cparam(ea2, cparam) < 0)
+        TEST_ERROR
+
+    /* Close the extra file handles */
+    if(H5Fclose(file0) < 0)
+        FAIL_STACK_ERROR
+    if(H5Fclose(file00) < 0)
+        FAIL_STACK_ERROR
+
+    /* Close array, delete array, close file & verify file is empty */
+    if(finish(file2, fapl, f2, ea2, ea_addr) < 0)
+        TEST_ERROR
+
+    /* All tests passed */
+    PASSED()
+
+    return 0;
+
+error:
+    H5E_BEGIN_TRY {
+        if(ea)
+            H5EA_close(ea, H5P_DATASET_XFER_DEFAULT);
+        if(ea2)
+            H5EA_close(ea2, H5P_DATASET_XFER_DEFAULT);
+	H5Fclose(file);
+	H5Fclose(file2);
+	H5Fclose(file0);
+	H5Fclose(file00);
+    } H5E_END_TRY;
+
+    return 1;
+} /* test_open_twice_diff() */
+
+
+/*-------------------------------------------------------------------------
  * Function:	test_delete_open
  *
  * Purpose:	Delete opened extensible array (& open deleted array)
@@ -1469,7 +1611,7 @@ eiter_fw_next(void *_eiter)
  *
  *-------------------------------------------------------------------------
  */
-static hssize_t
+static H5_ATTR_PURE hssize_t
 eiter_fw_max(const void *_eiter)
 {
     const eiter_fw_t *eiter = (const eiter_fw_t *)_eiter;
@@ -1687,7 +1829,7 @@ eiter_rv_next(void *_eiter)
  *
  *-------------------------------------------------------------------------
  */
-static hssize_t
+static H5_ATTR_PURE hssize_t
 eiter_rv_max(const void *_eiter)
 {
     const eiter_rv_t *eiter = (const eiter_rv_t *)_eiter;
@@ -1939,7 +2081,7 @@ eiter_rnd_next(void *_eiter)
  *
  *-------------------------------------------------------------------------
  */
-static hssize_t
+static H5_ATTR_PURE hssize_t
 eiter_rnd_max(const void *_eiter)
 {
     const eiter_rnd_t *eiter = (const eiter_rnd_t *)_eiter;
@@ -2160,7 +2302,7 @@ eiter_cyc_next(void *_eiter)
  *
  *-------------------------------------------------------------------------
  */
-static hssize_t
+static H5_ATTR_PURE hssize_t
 eiter_cyc_max(const void *_eiter)
 {
     const eiter_cyc_t *eiter = (const eiter_cyc_t *)_eiter;
@@ -2587,7 +2729,7 @@ main(void)
 
     /* Seed random #'s */
     curr_time = HDtime(NULL);
-    HDsrandom((unsigned long)curr_time);
+    HDsrandom((unsigned)curr_time);
 
     /* Create an empty file to retrieve size */
     {
@@ -2638,6 +2780,7 @@ main(void)
         nerrors += test_create(fapl, &cparam, &tparam);
         nerrors += test_reopen(fapl, &cparam, &tparam);
         nerrors += test_open_twice(fapl, &cparam, &tparam);
+        nerrors += test_open_twice_diff(fapl, &cparam, &tparam);
         nerrors += test_delete_open(fapl, &cparam, &tparam);
 	/* 
          *	nerrors += test_flush_depend(env_h5_drvr, fapl, &cparam, &tparam);
diff --git a/test/farray.c b/test/farray.c
index e3e59da..50a9856 100644
--- a/test/farray.c
+++ b/test/farray.c
@@ -102,6 +102,7 @@ struct farray_test_param_t {
 /* Local variables */
 const char *FILENAME[] = {
     "farray",
+    "farray_tmp",
     NULL
 };
 
@@ -159,9 +160,8 @@ create_file(hid_t fapl, hid_t *file, H5F_t **f)
         FAIL_STACK_ERROR
 
     /* Ignore metadata tags in the file's cache */
-    if(H5AC_ignore_tags(*f) < 0) {
+    if(H5AC_ignore_tags(*f) < 0)
         FAIL_STACK_ERROR
-    }
 
     /* Success */
     return(0);
@@ -274,17 +274,19 @@ reopen_file(hid_t *file, H5F_t **f, hid_t fapl, hid_t dxpl,
     /* (actually will close & re-open the file as well) */
     if(tparam->reopen_array) {
         /* Close array, if given */
-        if(fa) {
+        if(fa && *fa) {
             if(H5FA_close(*fa, dxpl) < 0)
                 FAIL_STACK_ERROR
             *fa = NULL;
         } /* end if */
 
         /* Close file */
-        if(H5Fclose(*file) < 0)
-            FAIL_STACK_ERROR
-        *file = (-1);
-        *f = NULL;
+        if(*file) {
+            if(H5Fclose(*file) < 0)
+                FAIL_STACK_ERROR
+            *file = (-1);
+            *f = NULL;
+        } /* end if */
 
         /* Re-open the file */
         if((*file = H5Fopen(filename_g, H5F_ACC_RDWR, fapl)) < 0)
@@ -295,15 +297,13 @@ reopen_file(hid_t *file, H5F_t **f, hid_t fapl, hid_t dxpl,
             FAIL_STACK_ERROR
 
         /* Ignore metadata tags in the file's cache */
-        if(H5AC_ignore_tags(*f) < 0) {
+        if(H5AC_ignore_tags(*f) < 0)
             FAIL_STACK_ERROR
-        }
 
         /* Re-open array, if given */
-        if(fa) {
+        if(fa)
             if(NULL == (*fa = H5FA_open(*f, dxpl, fa_addr, NULL)))
                 FAIL_STACK_ERROR
-        } /* end if */
     } /* end if */
 
     /* Success */
@@ -722,6 +722,144 @@ error:
 
 
 /*-------------------------------------------------------------------------
+ * Function:	test_open_twice_diff
+ *
+ * Purpose:	Open a fixed array twice, through different "top" file
+ *              handles, with an intermediate file open that takes the "shared"
+ *              file handle from the first fixed array's file pointer.
+ *
+ * Return:	Success:	0
+ *		Failure:	1
+ *
+ * Programmer:	Quincey Koziol
+ *              Friday, December 18, 2015
+ *
+ *-------------------------------------------------------------------------
+ */
+static unsigned
+test_open_twice_diff(hid_t fapl, H5FA_create_t *cparam, farray_test_param_t *tparam)
+{
+    char        filename_tmp[FARRAY_FILENAME_LEN];      /* Temporary file name */
+    hid_t	file = -1;              /* File ID */
+    hid_t	file2 = -1;             /* File ID */
+    hid_t	file0 = -1;             /* File ID */
+    hid_t	file00 = -1;            /* File ID */
+    H5F_t	*f = NULL;              /* Internal file object pointer */
+    H5F_t	*f2 = NULL;             /* Internal file object pointer */
+    H5FA_t      *fa = NULL;             /* Fixed array wrapper */
+    H5FA_t      *fa2 = NULL;            /* Fixed array wrapper */
+    haddr_t     fa_addr = HADDR_UNDEF;  /* Array address in file */
+
+    /*
+     * Display testing message
+     */
+    TESTING("open fixed array twice, through different file handles");
+
+    /* Create file & retrieve pointer to internal file object */
+    if(create_file(fapl, &file, &f) < 0)
+        TEST_ERROR
+
+    /* Create array */
+    if(create_array(f, H5P_DATASET_XFER_DEFAULT, cparam, &fa, &fa_addr) < 0)
+        TEST_ERROR
+
+    /* Open the array again, through the first file handle */
+    if(NULL == (fa2 = H5FA_open(f, H5P_DATASET_XFER_DEFAULT, fa_addr, NULL)))
+        FAIL_STACK_ERROR
+
+    /* Verify the creation parameters */
+    if(verify_cparam(fa, cparam) < 0)
+        TEST_ERROR
+    if(verify_cparam(fa2, cparam) < 0)
+        TEST_ERROR
+
+    /* Close the second fixed array wrapper */
+    if(H5FA_close(fa2, H5P_DATASET_XFER_DEFAULT) < 0)
+        FAIL_STACK_ERROR
+    fa2 = NULL;
+
+    /* Re-open the file */
+    /* (So that there is something holding the file open when the extensible
+     *  array is closed)
+     */
+    if((file0 = H5Fopen(filename_g, H5F_ACC_RDWR, fapl)) < 0)
+        FAIL_STACK_ERROR
+
+    /* Check for closing & re-opening the file */
+    if(reopen_file(&file, &f, fapl, H5P_DATASET_XFER_DEFAULT, &fa, fa_addr, tparam) < 0)
+        TEST_ERROR
+
+    /* Close the first fixed array wrapper */
+    if(H5FA_close(fa, H5P_DATASET_XFER_DEFAULT) < 0)
+        FAIL_STACK_ERROR
+    fa = NULL;
+
+    /* Close the first file */
+    /* (close before second file, to detect error on internal array header's
+     *  shared file information)
+     */
+    if(H5Fclose(file) < 0)
+        FAIL_STACK_ERROR
+    file = -1;
+
+    /* Open a different file */
+    /* (This re-allocates the 'top' file pointer and assigns it a different
+     *  'shared' file pointer, making the file pointer in the fixed array's
+     *  header stale)
+     */
+    h5_fixname(FILENAME[1], fapl, filename_tmp, sizeof(filename_tmp));
+    if((file00 = H5Fcreate(filename_tmp, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
+        FAIL_STACK_ERROR
+
+
+    /* Re-open the file with the fixed array */
+    if((file2 = H5Fopen(filename_g, H5F_ACC_RDWR, fapl)) < 0)
+        FAIL_STACK_ERROR
+
+    /* Get a pointer to the internal file object */
+    if(NULL == (f2 = (H5F_t *)H5I_object(file2)))
+        FAIL_STACK_ERROR
+
+    /* Open the fixed array through the second file handle */
+    if(NULL == (fa2 = H5FA_open(f2, H5P_DATASET_XFER_DEFAULT, fa_addr, NULL)))
+        FAIL_STACK_ERROR
+
+    /* Verify the creation parameters */
+    if(verify_cparam(fa2, cparam) < 0)
+        TEST_ERROR
+
+    /* Close the extra file handles */
+    if(H5Fclose(file0) < 0)
+        FAIL_STACK_ERROR
+    if(H5Fclose(file00) < 0)
+        FAIL_STACK_ERROR
+
+    /* Close array, delete array, close file & verify file is empty */
+    if(finish(file2, fapl, f2, fa2, fa_addr) < 0)
+        TEST_ERROR
+
+    /* All tests passed */
+    PASSED()
+
+    return 0;
+
+error:
+    H5E_BEGIN_TRY {
+        if(fa)
+            H5FA_close(fa, H5P_DATASET_XFER_DEFAULT);
+        if(fa2)
+            H5FA_close(fa2, H5P_DATASET_XFER_DEFAULT);
+	H5Fclose(file);
+	H5Fclose(file2);
+	H5Fclose(file0);
+	H5Fclose(file00);
+    } H5E_END_TRY;
+
+    return 1;
+} /* test_open_twice_diff() */
+
+
+/*-------------------------------------------------------------------------
  * Function:	test_delete_open
  *
  * Purpose:	Delete opened fixed array (& open deleted array)
@@ -1535,7 +1673,7 @@ main(void)
 
     /* Seed random #'s */
     curr_time = HDtime(NULL);
-    HDsrandom((unsigned long)curr_time);
+    HDsrandom((unsigned)curr_time);
 
     /* Create an empty file to retrieve size */
     {
@@ -1586,6 +1724,7 @@ main(void)
         nerrors += test_create(fapl, &cparam, &tparam);
         nerrors += test_reopen(fapl, &cparam, &tparam);
         nerrors += test_open_twice(fapl, &cparam, &tparam);
+        nerrors += test_open_twice_diff(fapl, &cparam, &tparam);
         nerrors += test_delete_open(fapl, &cparam, &tparam);
 
 	/* Iterate over the type of capacity tests */