[svn-r9341] Purpose:

    Bug fix

Description:
    Correct a couple of typos in the recent object resurrection code.

Platforms tested:
    FreeBSD 4.10 (sleipnir) w/parallel
    Too minor to require h5committest

2 files changed, 4 insertions, 4 deletions

diff --git a/src/H5Dmpio.c b/src/H5Dmpio.c
index e8da931..cbad339 100644
--- a/src/H5Dmpio.c
+++ b/src/H5Dmpio.c
@@ -143,13 +143,13 @@ H5D_mpio_spaces_xfer(H5F_t *f, const H5D_t *dset, size_t elmt_size,
     	HGOTO_ERROR(H5E_DATASPACE, H5E_BADTYPE, FAIL,"couldn't create MPI file type");
 
     /* Get the base address of the contiguous dataset or the chunk */
-    if(dset->layout.type == H5D_CONTIGUOUS)
+    if(dset->shared->layout.type == H5D_CONTIGUOUS)
        addr = H5D_contig_get_addr(dset) + mpi_file_offset;
     else {
         haddr_t   chunk_addr; /* for collective chunk IO */
 
-        assert(dset->layout.type == H5D_CHUNKED); 
-        chunk_addr=H5D_istore_get_addr(f,dxpl_id,&(dset->layout),store->chunk.offset,NULL);
+        assert(dset->shared->layout.type == H5D_CHUNKED); 
+        chunk_addr=H5D_istore_get_addr(f,dxpl_id,&(dset->shared->layout),store->chunk.offset,NULL);
         addr = H5F_BASE_ADDR(f) + chunk_addr + mpi_file_offset;
     }
 
diff --git a/src/H5FO.c b/src/H5FO.c
index 849a4db..d29712e 100644
--- a/src/H5FO.c
+++ b/src/H5FO.c
@@ -128,7 +128,7 @@ H5FO_opened(const H5F_t *f, haddr_t addr)
         open_obj=H5TB_NODE_DATA(obj_node);
         assert(open_obj);
         ret_value=open_obj->obj;
-        assert(ret_value>0);
+        assert(ret_value!=NULL);
     } /* end if */
     else
         ret_value=NULL;