diff options
| author | Dana Robinson <43805+derobins@users.noreply.github.com> | 2023-04-22 06:25:12 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-22 06:25:12 (GMT) |
| commit | 7707859279a60b32d2b6c915442a7c04d44445b4 (patch) | |
| tree | 890d16aa2408b270368b36ea4f05ca20fe2f16f6 /java | |
| parent | a4371b6fce577852691dfdeac642dec1dd4b9453 (diff) | |
| download | hdf5-7707859279a60b32d2b6c915442a7c04d44445b4.zip hdf5-7707859279a60b32d2b6c915442a7c04d44445b4.tar.gz hdf5-7707859279a60b32d2b6c915442a7c04d44445b4.tar.bz2 | |
Merge with develop (#2790)
Diffstat (limited to 'java')
| -rw-r--r-- | java/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | java/src/Makefile.am | 1 | ||||
| -rw-r--r-- | java/src/hdf/hdf5lib/H5.java | 6 | ||||
| -rw-r--r-- | java/src/jni/h5fImp.c | 4 |
4 files changed, 6 insertions, 7 deletions
diff --git a/java/CMakeLists.txt b/java/CMakeLists.txt index 86fab9d..ae37ceb 100644 --- a/java/CMakeLists.txt +++ b/java/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required (VERSION 3.18) project (HDF5_JAVA C Java) -set (CMAKE_MODULE_PATH "${HDF_RESOURCES_DIR};${HDF_RESOURCES_DIR}") +set (CMAKE_MODULE_PATH "${HDF_RESOURCES_DIR}") find_package (Java) #----------------------------------------------------------------------------- diff --git a/java/src/Makefile.am b/java/src/Makefile.am index f410942..aaa4052 100644 --- a/java/src/Makefile.am +++ b/java/src/Makefile.am @@ -127,7 +127,6 @@ CLEANFILES = classhdf5_java.stamp $(jarfile) $(JAVAROOT)/$(pkgpath)/callbacks/*. clean: rm -rf $(JAVAROOT)/* rm -f $(jarfile) - rm -rf javadoc rm -f classhdf5_java.stamp diff --git a/java/src/hdf/hdf5lib/H5.java b/java/src/hdf/hdf5lib/H5.java index 1633846..274dd5c 100644 --- a/java/src/hdf/hdf5lib/H5.java +++ b/java/src/hdf/hdf5lib/H5.java @@ -5115,8 +5115,8 @@ public class H5 implements java.io.Serializable { * * @param name * IN: File name to check. - * @param file_id - * IN: File identifier for a currently-open HDF5 file + * @param fapl_id + * IN: File access property list identifier * * @return true if file is accessible, false if not. * @@ -5125,7 +5125,7 @@ public class H5 implements java.io.Serializable { * @exception NullPointerException * name is null. **/ - public synchronized static native boolean H5Fis_accessible(String name, long file_id) + public synchronized static native boolean H5Fis_accessible(String name, long fapl_id) throws HDF5LibraryException, NullPointerException; /** diff --git a/java/src/jni/h5fImp.c b/java/src/jni/h5fImp.c index b915993..af06bdc 100644 --- a/java/src/jni/h5fImp.c +++ b/java/src/jni/h5fImp.c @@ -188,7 +188,7 @@ done: * Signature: (Ljava/lang/String;J)Z */ JNIEXPORT jboolean JNICALL -Java_hdf_hdf5lib_H5_H5Fis_1accessible(JNIEnv *env, jclass clss, jstring name, jlong file_id) +Java_hdf_hdf5lib_H5_H5Fis_1accessible(JNIEnv *env, jclass clss, jstring name, jlong fapl_id) { const char *fileName = NULL; htri_t bval = JNI_FALSE; @@ -200,7 +200,7 @@ Java_hdf_hdf5lib_H5_H5Fis_1accessible(JNIEnv *env, jclass clss, jstring name, jl PIN_JAVA_STRING(ENVONLY, name, fileName, NULL, "H5Fis_accessible: file name not pinned"); - if ((bval = H5Fis_accessible(fileName, (hid_t)file_id)) < 0) + if ((bval = H5Fis_accessible(fileName, (hid_t)fapl_id)) < 0) H5_LIBRARY_ERROR(ENVONLY); bval = (bval > 0) ? JNI_TRUE : JNI_FALSE; |