[svn-r19324] Description:

    Bring recent tweaks to extensible and fixed array file formats from
revise_chunks branch back to trunk.

Tested on:
        FreeBSD/32 6.3 (duty) in debug mode
        FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
        Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x,
                w/C++ & FORTRAN, w/threadsafe, in debug mode
        Linux/64-amd64 2.6 (amani) w/Intel compilers, w/default API=1.6.x,
                w/C++ & FORTRAN, in production mode
        Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
                w/szip filter, w/threadsafe, in production mode
        Linux/PPC 2.6 (heiwa) w/C++ & FORTRAN, w/threadsafe, in debug mode
        Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
                in production mode
        Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in debug mode
        Mac OS X/32 10.6.4 (amazon) in debug mode
        Mac OS X/32 10.6.4 (amazon) w/C++ & FORTRAN, w/threadsafe,
                in production mode
        Mac OS X/32 10.6.4 (amazon) w/parallel, in debug mode

1 files changed, 7 insertions, 7 deletions

diff --git a/src/H5FAcache.c b/src/H5FAcache.c
index 96510b5..14df4c8 100644
--- a/src/H5FAcache.c
+++ b/src/H5FAcache.c
@@ -556,15 +556,15 @@ H5FA__cache_dblock_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata))
     if(*p++ != H5FA_DBLOCK_VERSION)
 	H5E_THROW(H5E_VERSION, "wrong fixed array data block version")
 
+    /* Fixed array type */
+    if(*p++ != (uint8_t)udata->hdr->cparam.cls->id)
+	H5E_THROW(H5E_BADTYPE, "incorrect fixed array class")
+
     /* Address of header for array that owns this block (just for file integrity checks) */
     H5F_addr_decode(f, &p, &arr_addr);
     if(H5F_addr_ne(arr_addr, udata->hdr->addr))
 	H5E_THROW(H5E_BADVALUE, "wrong fixed array header address")
 
-    /* Fixed array type */
-    if(*p++ != (uint8_t)udata->hdr->cparam.cls->id)
-	H5E_THROW(H5E_BADTYPE, "incorrect fixed array class")
-
     /* Page initialization flags */
     if(dblock->npages > 0) {
 	HDmemcpy(dblock->dblk_page_init, p, dblock->dblk_page_init_size);
@@ -672,12 +672,12 @@ H5FA__cache_dblock_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr,
         /* Version # */
         *p++ = H5FA_DBLOCK_VERSION;
 
-        /* Address of array header for array which owns this block */
-        H5F_addr_encode(f, &p, dblock->hdr->addr);
-
         /* Fixed array type */
         *p++ = dblock->hdr->cparam.cls->id;
 
+        /* Address of array header for array which owns this block */
+        H5F_addr_encode(f, &p, dblock->hdr->addr);
+
         /* Page init flags */
 	if(dblock->npages > 0) {
 	    /* Store the 'page init' bitmasks */