[svn-r21124] Issue 2763 - adding OAPL_ID as a new parameter to H5Rdereference. A followup commit for r21117. I made 2 changes:

  1. Quincey changed H5P_DATASET_ACCESS_DEFAULT to H5P_DEFAULT for the tests that call H5Rdereference.  Inside H5R_dereference, I assigned H5P_DATASET_ACCESS_DEFAULT to OAPL_ID if it is H5P_DEFAULT.
  2. I added the test for invalid OAPL_ID in trefer.c.

Tested on jam, koala, heiwa.

1 files changed, 6 insertions, 0 deletions

diff --git a/src/H5R.c b/src/H5R.c
index e2d6bf3..49ef357 100644
--- a/src/H5R.c
+++ b/src/H5R.c
@@ -466,6 +466,12 @@ H5R_dereference(H5F_t *file, hid_t oapl_id, hid_t dxpl_id, H5R_type_t ref_type,
             {
                 H5D_t *dset;                /* Pointer to dataset to open */
 
+                /* Get correct property list */
+                if(H5P_DEFAULT == oapl_id)
+                    oapl_id = H5P_DATASET_ACCESS_DEFAULT;
+                else if(TRUE != H5P_isa_class(oapl_id, H5P_DATASET_ACCESS))
+                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not dataset access property list")
+
                 /* Open the dataset */
                 if(NULL == (dset = H5D_open(&loc, oapl_id, dxpl_id)))
                     HGOTO_ERROR(H5E_DATASET, H5E_NOTFOUND, FAIL, "not found")