diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2018-03-06 16:03:09 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2018-03-06 16:03:09 (GMT) |
| commit | f4ac515fed56ded7b1c2ca9d6dedbfebd68501fb (patch) | |
| tree | bf4d751fceb7d22e58f47ac9fd593c06776ffbbc /java | |
| parent | 5c4bab04f59bdb1821635e580bae3ce357cbd580 (diff) | |
| download | hdf5-f4ac515fed56ded7b1c2ca9d6dedbfebd68501fb.zip hdf5-f4ac515fed56ded7b1c2ca9d6dedbfebd68501fb.tar.gz hdf5-f4ac515fed56ded7b1c2ca9d6dedbfebd68501fb.tar.bz2 | |
Merge 10414, 10292, VFD fix from develop
Diffstat (limited to 'java')
| -rw-r--r-- | java/src/jni/h5dImp.c | 2 | ||||
| -rw-r--r-- | java/test/TestH5Pfapl.java | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/java/src/jni/h5dImp.c b/java/src/jni/h5dImp.c index 66efed0..9784055 100644 --- a/java/src/jni/h5dImp.c +++ b/java/src/jni/h5dImp.c @@ -1019,7 +1019,7 @@ Java_hdf_hdf5lib_H5_H5DreadVL } /* end else */ return (jint)status; -} /* end Java_hdf_hdf5lib_H5_H5Dread_1VLStrings */ +} /* end Java_hdf_hdf5lib_H5_H5Dread_1VL */ herr_t H5DreadVL_asstr diff --git a/java/test/TestH5Pfapl.java b/java/test/TestH5Pfapl.java index 48a5986..0651502 100644 --- a/java/test/TestH5Pfapl.java +++ b/java/test/TestH5Pfapl.java @@ -26,6 +26,7 @@ import hdf.hdf5lib.H5; import hdf.hdf5lib.HDF5Constants; import hdf.hdf5lib.exceptions.HDF5Exception; import hdf.hdf5lib.exceptions.HDF5LibraryException; +import hdf.hdf5lib.exceptions.HDF5PropertyListInterfaceException; import hdf.hdf5lib.structs.H5AC_cache_config_t; import org.junit.After; @@ -1385,6 +1386,13 @@ public class TestH5Pfapl { ret_val_id = H5.H5Pget_evict_on_close(fapl_id); assertTrue("H5P_evict_on_close", ret_val_id); } + catch (HDF5PropertyListInterfaceException err) { + // parallel is not supported + if (err.getMinorErrorNumber() != HDF5Constants.H5E_UNSUPPORTED) { + err.printStackTrace(); + fail("H5P_evict_on_close: " + err); + } + } catch (Throwable err) { err.printStackTrace(); fail("H5P_evict_on_close: " + err); |