summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2019-10-03 19:12:23 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2019-10-03 19:12:23 (GMT)
commit638d31a78a9ea5db438d30e78f8cbaa1146b7f87 (patch)
tree69c380fcb60def4aa71527afa2546fa6f8baf009
parent35bc2d4592650da28f952c7d44b4460bc86452de (diff)
downloadhdf5-638d31a78a9ea5db438d30e78f8cbaa1146b7f87.zip
hdf5-638d31a78a9ea5db438d30e78f8cbaa1146b7f87.tar.gz
hdf5-638d31a78a9ea5db438d30e78f8cbaa1146b7f87.tar.bz2
Fixed the java assert issue with H5O cache corking calls.
-rw-r--r--src/H5I.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/H5I.c b/src/H5I.c
index 201ad9a..76faab1 100644
--- a/src/H5I.c
+++ b/src/H5I.c
@@ -1109,7 +1109,8 @@ H5I_is_file_object(hid_t id)
FUNC_ENTER_NOAPI(FAIL);
/* Fail if the ID type is out of range */
- HDassert(id_type >= 1 && id_type < H5I_NTYPES);
+ if (id_type < 1 || id_type >= H5I_NTYPES)
+ HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "ID type out of range");
/* Return TRUE if the ID is a file object (dataset, group, map, or committed
* datatype), FALSE otherwise.
@@ -1122,7 +1123,7 @@ H5I_is_file_object(hid_t id)
H5T_t *dt = NULL;
if(NULL == (dt = (H5T_t *)H5I_object(id)))
- HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "unable to get underlying datatype struct")
+ HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "unable to get underlying datatype struct");
ret_value = H5T_is_named(dt);
}
@@ -1131,7 +1132,7 @@ H5I_is_file_object(hid_t id)
}
done:
- FUNC_LEAVE_NOAPI(ret_value)
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5I_is_file_object() */