diff options
author | Allen Byrne <byrn@hdfgroup.org> | 2019-04-30 20:38:50 (GMT) |
---|---|---|
committer | Allen Byrne <byrn@hdfgroup.org> | 2019-04-30 20:38:50 (GMT) |
commit | 4dfcc225ba98a5ad1bc4283b8eacde0bb6f7484c (patch) | |
tree | 8b593174b7040712b69b046cb833ed02c1175be8 | |
parent | 2de6faf82bf9fc439f8a4c3a2c078bd172e9278d (diff) | |
parent | eb2476bc41d30e856a453990a0b0fdc89e3f5ad5 (diff) | |
download | hdf5-4dfcc225ba98a5ad1bc4283b8eacde0bb6f7484c.zip hdf5-4dfcc225ba98a5ad1bc4283b8eacde0bb6f7484c.tar.gz hdf5-4dfcc225ba98a5ad1bc4283b8eacde0bb6f7484c.tar.bz2 |
Merge pull request #1684 in HDFFV/hdf5 from ~JHENDERSON/hdf5:hdf5_1_10 to hdf5_1_10
* commit 'eb2476bc41d30e856a453990a0b0fdc89e3f5ad5':
Fix Java JUnit-TestH5P failure on 32-bit arch
-rw-r--r-- | java/src/jni/h5pFCPLImp.c | 2 | ||||
-rw-r--r-- | release_docs/RELEASE.txt | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/java/src/jni/h5pFCPLImp.c b/java/src/jni/h5pFCPLImp.c index 34ac065..cc7c264 100644 --- a/java/src/jni/h5pFCPLImp.c +++ b/java/src/jni/h5pFCPLImp.c @@ -240,7 +240,7 @@ Java_hdf_hdf5lib_H5_H5Pget_1sym_1k done: if (theArray) - UNPIN_LONG_ARRAY(ENVONLY, size, theArray, (status < 0) ? JNI_ABORT : 0); + UNPIN_INT_ARRAY(ENVONLY, size, theArray, (status < 0) ? JNI_ABORT : 0); return (jint)status; } /* end Java_hdf_hdf5lib_H5_H5Pget_1sym_1k */ diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index 264fec9..a3f2232 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -263,6 +263,10 @@ New Features Java Library: ---------------- + - Fix a failure in JUnit-TestH5P on 32-bit architectures + + (JTH - 2019/04/30) + - Rewrote the JNI error handling to be much cleaner (JTH - 2019/02/12) |