diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2014-03-12 15:22:18 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2014-03-12 15:22:18 (GMT) |
| commit | e35427c3715748408384e8cad5af88f3671e3976 (patch) | |
| tree | 75d6d5de8a13e2c5f0b875f308993f39304a526b | |
| parent | 0ed93555aef7459b2a7ddaaac84f3186ea6bac9d (diff) | |
| download | hdf5-e35427c3715748408384e8cad5af88f3671e3976.zip hdf5-e35427c3715748408384e8cad5af88f3671e3976.tar.gz hdf5-e35427c3715748408384e8cad5af88f3671e3976.tar.bz2 | |
[svn-r24784] fix map get bug.
| -rw-r--r-- | src/H5VLiod_client.c | 14 | ||||
| -rw-r--r-- | src/H5VLiod_map.c | 2 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/H5VLiod_client.c b/src/H5VLiod_client.c index 6cc70e0..525f595 100644 --- a/src/H5VLiod_client.c +++ b/src/H5VLiod_client.c @@ -946,12 +946,14 @@ H5VL_iod_request_complete(H5VL_iod_file_t *file, H5VL_iod_request_t *req) /* free stuff associated with request */ info->value_handle = (hg_bulk_t *)H5MM_xfree(info->value_handle); - if(H5Tclose(info->val_mem_type_id) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTRELEASE, FAIL, "unable to release datatype"); - if(H5Tclose(info->key_mem_type_id) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTRELEASE, FAIL, "unable to release datatype"); - if(H5Pclose(info->dxpl_id) < 0) - HGOTO_ERROR(H5E_PLIST, H5E_CANTRELEASE, FAIL, "unable to release plist"); + if(info->val_is_vl) { + if(H5Tclose(info->val_mem_type_id) < 0) + HGOTO_ERROR(H5E_DATATYPE, H5E_CANTRELEASE, FAIL, "unable to release datatype"); + if(H5Tclose(info->key_mem_type_id) < 0) + HGOTO_ERROR(H5E_DATATYPE, H5E_CANTRELEASE, FAIL, "unable to release datatype"); + if(H5Pclose(info->dxpl_id) < 0) + HGOTO_ERROR(H5E_PLIST, H5E_CANTRELEASE, FAIL, "unable to release plist"); + } free(info->output); info->output = NULL; diff --git a/src/H5VLiod_map.c b/src/H5VLiod_map.c index dc23808..2f88c3d 100644 --- a/src/H5VLiod_map.c +++ b/src/H5VLiod_map.c @@ -645,7 +645,7 @@ H5VL_iod_server_map_get_cb(AXE_engine_t UNUSED axe_engine, if(iod_kv_get_value(iod_oh, rtid, key.buf, (iod_size_t)key.buf_size, NULL, &src_size, NULL, NULL) < 0) - HGOTO_ERROR2(H5E_SYM, H5E_CANTGET, FAIL, "can't retrieve value from parent KV store"); + HGOTO_ERROR2(H5E_SYM, H5E_CANTGET, FAIL, "can't retrieve value size from parent KV store"); if(val_is_vl) { output.ret = ret_value; |