[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, 20 insertions, 15 deletions

diff --git a/src/H5Fdbg.c b/src/H5Fdbg.c
index e05c32a..a4577c9 100644
--- a/src/H5Fdbg.c
+++ b/src/H5Fdbg.c
@@ -123,21 +123,26 @@ H5F_debug(H5F_t *f, FILE *stream, int indent, int fwidth)
 	      "Root group symbol table entry:",
 	      f->shared->root_grp ? "" : "(none)");
     if(f->shared->root_grp) {
-        H5O_loc_t *root_oloc;   /* Root object location */
-        H5G_entry_t root_ent;   /* Constructed root symbol table entry */
-
-        /* Reset the root group entry */
-        H5G_ent_reset(&root_ent);
-
-        /* Build up a simulated root group symbol table entry */
-        root_oloc = H5G_oloc(f->shared->root_grp);
-        HDassert(root_oloc);
-        root_ent.type = H5G_NOTHING_CACHED;
-        root_ent.header = root_oloc->addr;
-        root_ent.file = f;
-
-        /* Display root group symbol table entry info */
-	H5G_ent_debug(f, &root_ent, stream, indent + 3, MAX(0, fwidth - 3), NULL);
+        if(f->shared->root_ent) /* Use real root group symbol table entry */
+            H5G_ent_debug(f, f->shared->root_ent, stream, indent + 3,
+                MAX(0, fwidth - 3), NULL);
+        else {
+            H5O_loc_t *root_oloc;   /* Root object location */
+            H5G_entry_t root_ent;   /* Constructed root symbol table entry */
+
+            /* Reset the root group entry */
+            H5G_ent_reset(&root_ent);
+
+            /* Build up a simulated root group symbol table entry */
+            root_oloc = H5G_oloc(f->shared->root_grp);
+            HDassert(root_oloc);
+            root_ent.type = H5G_NOTHING_CACHED;
+            root_ent.header = root_oloc->addr;
+            root_ent.file = f;
+
+            /* Display root group symbol table entry info */
+            H5G_ent_debug(f, &root_ent, stream, indent + 3, MAX(0, fwidth - 3), NULL);
+        }
     } /* end if */
 
 done: