Merge pull request #1095 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop

* commit '1a018cb3340ec8ecd4ded25ec719ac831aa165bd':
  Fix jni function call version

2 files changed, 4 insertions, 4 deletions

diff --git a/java/src/jni/h5oImp.c b/java/src/jni/h5oImp.c
index d9276da..7665c70 100644
--- a/java/src/jni/h5oImp.c
+++ b/java/src/jni/h5oImp.c
@@ -442,7 +442,7 @@ Java_hdf_hdf5lib_H5_H5Ovisit
         h5nullArgument(env, "H5Ovisit:  callback_op is NULL");
     } /* end if */
     else {
-        status = H5Ovisit((hid_t)grp_id, (H5_index_t)idx_type, (H5_iter_order_t)order, (H5O_iterate_t)H5O_iterate_cb, (void*)op_data, (unsigned)fields);
+        status = H5Ovisit2((hid_t)grp_id, (H5_index_t)idx_type, (H5_iter_order_t)order, (H5O_iterate_t)H5O_iterate_cb, (void*)op_data, (unsigned)fields);
 
         if (status < 0)
             h5libraryError(env);
@@ -478,7 +478,7 @@ Java_hdf_hdf5lib_H5_H5Ovisit_1by_1name
     else {
         PIN_JAVA_STRING(name, lName);
         if (lName != NULL) {
-            status = H5Ovisit_by_name((hid_t)grp_id, lName, (H5_index_t)idx_type, (H5_iter_order_t)order, (H5O_iterate_t)H5O_iterate_cb, (void*)op_data, (unsigned)fields, (hid_t)access_id);
+            status = H5Ovisit_by_name2((hid_t)grp_id, lName, (H5_index_t)idx_type, (H5_iter_order_t)order, (H5O_iterate_t)H5O_iterate_cb, (void*)op_data, (unsigned)fields, (hid_t)access_id);
 
             UNPIN_JAVA_STRING(name, lName);
 
diff --git a/java/src/jni/h5pImp.c b/java/src/jni/h5pImp.c
index 49cfeb9..3ff7436 100644
--- a/java/src/jni/h5pImp.c
+++ b/java/src/jni/h5pImp.c
@@ -5204,10 +5204,10 @@ Java_hdf_hdf5lib_H5_H5Pset_1append_1flush
     visit_callback = callback_op;
 
     if (op_data == NULL) {
-        h5nullArgument(env, "H5Ovisit:  op_data is NULL");
+        h5nullArgument(env, "H5Pset_append_flush:  op_data is NULL");
     } /* end if */
     else if (callback_op == NULL) {
-        h5nullArgument(env, "H5Ovisit:  callback_op is NULL");
+        h5nullArgument(env, "H5Pset_append_flush:  callback_op is NULL");
     } /* end if */
     else {
         status = H5Pset_append_flush((hid_t)plist_id, (unsigned)ndims, (const hsize_t*)boundary, (H5D_append_cb_t)H5D_append_cb, (void*)op_data);