[svn-r16601] Description:

	Bring r16536:16600 from trunk back into revise_chunks branch

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/C++ & FORTRAN, w/threadsafe,
                                in debug mode
        Linux/64-amd64 2.6 (smirom) 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, in production mode
        Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
                                in production mode
        Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in production mode
        Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
        Mac OS X/32 10.5.6 (amazon) in debug mode
        Mac OS X/32 10.5.6 (amazon) w/C++ & FORTRAN, w/threadsafe,
                                in production mode

1 files changed, 18 insertions, 0 deletions

diff --git a/src/H5G.c b/src/H5G.c
index 6a7e505..042ce90 100644
--- a/src/H5G.c
+++ b/src/H5G.c
@@ -896,6 +896,24 @@ H5G_mkroot(H5F_t *f, hid_t dxpl_id, H5G_loc_t *loc)
 	 */
 	if(H5O_open(loc->oloc) < 0)
 	    HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open root group")
+
+#ifndef H5_STRICT_FORMAT_CHECKS
+        /* If symbol table information is cached, check if we should replace the
+         * symbol table message with the cached symbol table information */
+        if((H5F_INTENT(f) & H5F_ACC_RDWR) && f->shared->root_ent
+                && (f->shared->root_ent->type == H5G_CACHED_STAB)) {
+            H5O_stab_t      cached_stab;
+
+            /* Retrieve the cached symbol table information */
+            cached_stab.btree_addr = f->shared->root_ent->cache.stab.btree_addr;
+            cached_stab.heap_addr = f->shared->root_ent->cache.stab.heap_addr;
+
+            /* Check if the symbol table message is valid, and replace with the
+             * cached symbol table if necessary */
+            if(H5G_stab_valid(loc->oloc, dxpl_id, &cached_stab) < 0)
+                HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to verify symbol table")
+        } /* end if */
+#endif /* H5_STRICT_FORMAT_CHECKS */
     } /* end else */
 
     /* Create the path names for the root group's entry */