Merge pull request #5 in ~VCHOI/my_third_fork from develop to bugfix/new_shutdown_fsm

* commit '66699f2c7d889e725ced0fba579621ef97726b41': (49 commits)
  Minor fixes/improvements for VDS performance improvement (HDFFV-10693).
  Refactor H5S__hyper_project_intersection to operate directly on span trees, improving performance and removing the conditionn that the extents be equal.
  Refactor H5S__hyper_project_intersection to operate directly on span trees, improving performance and removing the conditionn that the extents be equal.
  Added code that disallows unregistering the native VOL connector.
  Rename H5VL_ID_GET_NAME to H5VL_OBJECT_GET_NAME
  Correct message command syntax
  Assign NULL to func_name/file_name/desc error entry pointers when clearing error stack
  Avoid clearing error stack when calling H5Eget_msg()
  Reorder lines in HDF5config.cmake so that additions to end of $HPC-HDF5options scripts will take precedence.
  updated -E option
  remove -M option
  added -M HPC to ctest command
  fixed missing paralle test
  Adding cross-compilation for theta (ANL) and qsub (COBALT) batch controls.
  Add note about CMake and spaces in paths
  Putting ctest command in variable CMD did not work for skipping failing tests.
  Code improvement Description:     Fixed potential division by zero occurrences and changed an assert to     if statement. Platforms tested:     Linux/64 (jelly)     Linux/64 (platypus)     Darwin (osx1011test)
  Combine "collective group and dataset write" and "independent group and dataset read" tests into one test.  The second test is dependent on the file created by the first test, and will not pass when run by itself.
  Add final list of single testphdf5 tests
  Pull a test from default testphdf5
  ...

4 files changed, 7 insertions, 7 deletions

diff --git a/java/CMakeLists.txt b/java/CMakeLists.txt
index ffc3b94..528b24f 100644
--- a/java/CMakeLists.txt
+++ b/java/CMakeLists.txt
@@ -11,8 +11,8 @@ include (${HDF_RESOURCES_DIR}/UseJava.cmake)
 
 message (STATUS "JAVA: JAVA_HOME=$ENV{JAVA_HOME} JAVA_ROOT=$ENV{JAVA_ROOT}")
 find_package (JNI)
-message ("JNI_LIBRARIES=${JNI_LIBRARIES}")
-message ("JNI_INCLUDE_DIRS=${JNI_INCLUDE_DIRS}")
+message (STATUS "JNI_LIBRARIES=${JNI_LIBRARIES}")
+message (STATUS "JNI_INCLUDE_DIRS=${JNI_INCLUDE_DIRS}")
 
 
 if (WIN32)
diff --git a/java/src/hdf/hdf5lib/H5.java b/java/src/hdf/hdf5lib/H5.java
index e874732..a1a8ede 100644
--- a/java/src/hdf/hdf5lib/H5.java
+++ b/java/src/hdf/hdf5lib/H5.java
@@ -212,7 +212,7 @@ import hdf.hdf5lib.structs.H5O_info_t;
  * exception handlers to print out the HDF-5 error stack.
  * <hr>
  *
- * @version HDF5 1.11.5 <BR>
+ * @version HDF5 1.11.6 <BR>
  *          <b>See also: <a href ="./hdf.hdf5lib.HDFArray.html"> hdf.hdf5lib.HDFArray</a> </b><BR>
  *          <a href ="./hdf.hdf5lib.HDF5Constants.html"> hdf.hdf5lib.HDF5Constants</a><BR>
  *          <a href ="./hdf.hdf5lib.HDF5CDataTypes.html"> hdf.hdf5lib.HDF5CDataTypes</a><BR>
@@ -235,7 +235,7 @@ public class H5 implements java.io.Serializable {
      *
      * Make sure to update the versions number when a different library is used.
      */
-    public final static int LIB_VERSION[] = { 1, 11, 5 };
+    public final static int LIB_VERSION[] = { 1, 11, 6 };
 
     public final static String H5PATH_PROPERTY_KEY = "hdf.hdf5lib.H5.hdf5lib";
 
diff --git a/java/src/jni/h5pFCPLImp.c b/java/src/jni/h5pFCPLImp.c
index 9c82ba6..2160496 100644
--- a/java/src/jni/h5pFCPLImp.c
+++ b/java/src/jni/h5pFCPLImp.c
@@ -201,7 +201,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/java/test/TestH5.java b/java/test/TestH5.java
index 1d24724..d63ef01 100644
--- a/java/test/TestH5.java
+++ b/java/test/TestH5.java
@@ -162,7 +162,7 @@ public class TestH5 {
      */
     @Test
     public void testH5get_libversion() {
-        int libversion[] = { 1, 11, 5 };
+        int libversion[] = { 1, 11, 6 };
 
         try {
             H5.H5get_libversion(libversion);
@@ -201,7 +201,7 @@ public class TestH5 {
      */
     @Test
     public void testH5check_version() {
-        int majnum = 1, minnum = 11, relnum = 5;
+        int majnum = 1, minnum = 11, relnum = 6;
 
         try {
             H5.H5check_version(majnum, minnum, relnum);