mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-01-30 15:32:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r29560] Remove list and check of flags, defer to library function for checking, which will return an error. That error then produces a HDF5FunctionArgument exception instead of IllegalArgument exception.

Browse Source
This commit is contained in:
Allen Byrne 2016-03-24 12:21:04 -05:00
parent d9ab44fe46
commit 261f8c8361
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
java/src/jni/h5pImp.c
View File

@ -2965,16 +2965,10 @@ Java_hdf_hdf5lib_H5_H5Pset_1elink_1acc_1flags(JNIEnv *env, jclass clss, jlong la
{
herr_t retVal = -1;
if (((unsigned) flags != H5F_ACC_RDWR) &&
((unsigned) flags != H5F_ACC_RDONLY) &&
((unsigned) flags != H5F_ACC_DEFAULT)) {
h5badArgument(env, "H5Pset_elink_acc_flags: invalid flags value");
} /* end if */
else {
retVal = H5Pset_elink_acc_flags((hid_t)lapl_id, (unsigned)flags);
if (retVal < 0)
h5libraryError(env);
} /* end else */
retVal = H5Pset_elink_acc_flags((hid_t)lapl_id, (unsigned)flags);
if (retVal < 0)
h5libraryError(env);
return (jint) retVal;
} /* end Java_hdf_hdf5lib_H5_H5Pset_1elink_1acc_1flags */

5
java/test/TestH5P.java
View File

@ -25,6 +25,7 @@ import java.io.File;
import hdf.hdf5lib.H5;
import hdf.hdf5lib.HDF5Constants;
import hdf.hdf5lib.exceptions.HDF5Exception;
import hdf.hdf5lib.exceptions.HDF5FunctionArgumentException;
import hdf.hdf5lib.exceptions.HDF5LibraryException;
import org.junit.After;
@ -496,12 +497,12 @@ public class TestH5P {
assertEquals(HDF5Constants.H5F_ACC_RDWR, get_flags);
}
@Test(expected = IllegalArgumentException.class)
@Test(expected = HDF5FunctionArgumentException.class)
public void testH5Pset_elink_acc_flags_InvalidFlag1() throws Throwable {
H5.H5Pset_elink_acc_flags(lapl_id, HDF5Constants.H5F_ACC_TRUNC);
}
@Test(expected = IllegalArgumentException.class)
@Test(expected = HDF5FunctionArgumentException.class)
public void testH5Pset_elink_acc_flags_InvalidFlag2() throws Throwable {
H5.H5Pset_elink_acc_flags(lapl_id, -1);
}