diff options
| author | Neil Fortner <nfortne2@hdfgroup.org> | 2019-11-12 18:06:52 (GMT) |
|---|---|---|
| committer | David Young <dyoung@hdfgroup.org> | 2020-05-20 14:17:26 (GMT) |
| commit | 814d5c3875a54101401b1d4bcff68d7124aeeb05 (patch) | |
| tree | 687695e3d0001072c6f2c766f11e160b7f3b55a2 /src | |
| parent | 058d7a1b3cbc17f1b47ec812ec897b44dfccd258 (diff) | |
| download | hdf5-814d5c3875a54101401b1d4bcff68d7124aeeb05.zip hdf5-814d5c3875a54101401b1d4bcff68d7124aeeb05.tar.gz hdf5-814d5c3875a54101401b1d4bcff68d7124aeeb05.tar.bz2 | |
Fix issue where H5R__reopen_file did not make the file "post open"
callback.
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5F.c | 2 | ||||
| -rw-r--r-- | src/H5Rint.c | 9 |
2 files changed, 10 insertions, 1 deletions
@@ -768,7 +768,7 @@ H5Fopen(const char *filename, unsigned flags, hid_t fapl_id) /* Get the file object */ if(NULL == (vol_obj = H5VL_vol_object(ret_value))) - HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5I_INVALID_HID, "invalid object identifier") + HGOTO_ERROR(H5E_FILE, H5E_CANTGET, H5I_INVALID_HID, "invalid object identifier") /* Make the post open callback */ if(H5VL_file_specific(vol_obj, H5VL_FILE_POST_OPEN, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL) < 0) diff --git a/src/H5Rint.c b/src/H5Rint.c index 443a245..504ae06 100644 --- a/src/H5Rint.c +++ b/src/H5Rint.c @@ -504,6 +504,7 @@ H5R__reopen_file(H5R_ref_priv_t *ref, hid_t fapl_id) H5VL_connector_prop_t connector_prop; unsigned flags = H5F_ACC_RDWR; /* Must open file read-write to allow for object modifications */ H5P_genplist_t *plist; + H5VL_object_t *vol_obj = NULL; /* VOL object for file */ hid_t ret_value = H5I_INVALID_HID; FUNC_ENTER_PACKAGE @@ -534,6 +535,14 @@ H5R__reopen_file(H5R_ref_priv_t *ref, hid_t fapl_id) if((ret_value = H5VL_register_using_vol_id(H5I_FILE, new_file, connector_prop.connector_id, TRUE)) < 0) HGOTO_ERROR(H5E_FILE, H5E_CANTREGISTER, H5I_INVALID_HID, "unable to atomize file handle") + /* Get the file object */ + if(NULL == (vol_obj = H5VL_vol_object(ret_value))) + HGOTO_ERROR(H5E_FILE, H5E_CANTGET, H5I_INVALID_HID, "invalid object identifier") + + /* Make the post open callback */ + if(H5VL_file_specific(vol_obj, H5VL_FILE_POST_OPEN, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL) < 0) + HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, H5I_INVALID_HID, "unable to make file post open callback") + /* Attach loc_id to reference */ if(H5R__set_loc_id((H5R_ref_priv_t *)ref, ret_value, FALSE) < 0) HGOTO_ERROR(H5E_REFERENCE, H5E_CANTSET, H5I_INVALID_HID, "unable to attach location id to reference") |