Merge pull request #1175 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop

* commit '6e4c036d5dc476396428f4b044e23043a80e8df7':
  HDFFV-10544 Correct var name
  HDFFV-10544 remove native from class function
  HDFFV-10544 correct typo
  HDFFV-10544 add release note
  HDFFV-10544 add class name to error text
  HDFFV-10544 exception variable as local class
  Improve error handling of exceptions

7 files changed, 105 insertions, 58 deletions

diff --git a/java/src/hdf/hdf5lib/exceptions/HDF5LibraryException.java b/java/src/hdf/hdf5lib/exceptions/HDF5LibraryException.java
index 5ae977d..3a1361a 100644
--- a/java/src/hdf/hdf5lib/exceptions/HDF5LibraryException.java
+++ b/java/src/hdf/hdf5lib/exceptions/HDF5LibraryException.java
@@ -30,6 +30,9 @@ import hdf.hdf5lib.HDF5Constants;
 
 @SuppressWarnings("serial")
 public class HDF5LibraryException extends HDF5Exception {
+    private final long majorErrorNumber;
+    private final long minorErrorNumber;
+
     /**
      * Constructs an <code>HDF5LibraryException</code> with no specified detail
      * message.
@@ -44,9 +47,10 @@ public class HDF5LibraryException extends HDF5Exception {
         }
         catch (Exception e) {
         }
-        ;
 
-        detailMessage = getMinorError(getMinorErrorNumber());
+        this.majorErrorNumber = _getMajorErrorNumber();
+        this.minorErrorNumber = _getMinorErrorNumber();
+        detailMessage = getMinorError(minorErrorNumber);
     }
 
     /**
@@ -65,7 +69,8 @@ public class HDF5LibraryException extends HDF5Exception {
         }
         catch (Exception e) {
         }
-        ;
+        this.majorErrorNumber = _getMajorErrorNumber();
+        this.minorErrorNumber = _getMinorErrorNumber();
     }
 
     /**
@@ -74,7 +79,11 @@ public class HDF5LibraryException extends HDF5Exception {
      *
      * @return the major error number
      */
-    public native long getMajorErrorNumber();
+    public long getMajorErrorNumber()
+    {
+        return majorErrorNumber;
+    }
+    private native long _getMajorErrorNumber();
 
     /**
      * Get the minor error number of the first error on the HDF5 library error
@@ -82,7 +91,11 @@ public class HDF5LibraryException extends HDF5Exception {
      *
      * @return the minor error number
      */
-    public native long getMinorErrorNumber();
+    public long getMinorErrorNumber()
+    {
+        return minorErrorNumber;
+    }
+    private native long _getMinorErrorNumber();
 
     /**
      * Return a error message for the minor error number.
diff --git a/java/src/jni/exceptionImp.c b/java/src/jni/exceptionImp.c
index afad5d5..69f8dde 100644
--- a/java/src/jni/exceptionImp.c
+++ b/java/src/jni/exceptionImp.c
@@ -83,9 +83,14 @@ typedef struct H5E_num_t {
     }                                                                       \
     jm = ENVPTR->GetMethodID(ENVPAR jc, "<init>", "(Ljava/lang/String;)V"); \
     if (jm == NULL) {                                                       \
+        printf("FATAL ERROR: GetMethodID failed\n");                        \
         return JNI_FALSE;                                                   \
     }                                                                       \
     ex = ENVPTR->NewObjectA (ENVPAR jc, jm, (jvalue*)(args));               \
+    if (ex == NULL) {                                                       \
+        printf("FATAL ERROR:  %s: Creation failed\n", (className));         \
+        return JNI_FALSE;                                                   \
+    }                                                                       \
     if (ENVPTR->Throw(ENVPAR (jthrowable)ex) < 0) {                         \
         printf("FATAL ERROR:  %s: Throw failed\n", (className));            \
         return JNI_FALSE;                                                   \
@@ -174,13 +179,13 @@ Java_hdf_hdf5lib_exceptions_HDF5LibraryException_printStackTrace0
 
 /*
  * Class:     hdf_hdf5lib_exceptions_HDFLibraryException
- * Method:    getMajorErrorNumber
+ * Method:    _getMajorErrorNumber
  * Signature: ()J
  *
  *  Extract the HDF-5 major error number from the HDF-5 error stack.
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_exceptions_HDF5LibraryException_getMajorErrorNumber
+Java_hdf_hdf5lib_exceptions_HDF5LibraryException__1getMajorErrorNumber
     (JNIEnv *env, jobject obj)
 {
     H5E_num_t err_nums;
@@ -190,17 +195,17 @@ Java_hdf_hdf5lib_exceptions_HDF5LibraryException_getMajorErrorNumber
     H5Ewalk2(H5E_DEFAULT, H5E_WALK_DOWNWARD, walk_error_callback, &err_nums);
 
     return err_nums.maj_num;
-} /* end Java_hdf_hdf5lib_exceptions_HDF5LibraryException_getMajorErrorNumber() */
+} /* end Java_hdf_hdf5lib_exceptions_HDF5LibraryException__1getMajorErrorNumber() */
 
 /*
  * Class:     hdf_hdf5lib_exceptions_HDFLibraryException
- * Method:    getMinorErrorNumber
+ * Method:    _getMinorErrorNumber
  * Signature: ()J
  *
  *  Extract the HDF-5 minor error number from the HDF-5 error stack.
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_exceptions_HDF5LibraryException_getMinorErrorNumber
+Java_hdf_hdf5lib_exceptions_HDF5LibraryException__1getMinorErrorNumber
     (JNIEnv *env, jobject obj)
 {
     H5E_num_t err_nums;
@@ -210,7 +215,7 @@ Java_hdf_hdf5lib_exceptions_HDF5LibraryException_getMinorErrorNumber
     H5Ewalk2(H5E_DEFAULT, H5E_WALK_DOWNWARD, walk_error_callback, &err_nums);
 
     return err_nums.min_num;
-} /* end Java_hdf_hdf5lib_exceptions_HDF5LibraryException_getMinorErrorNumber() */
+} /* end Java_hdf_hdf5lib_exceptions_HDF5LibraryException__1getMinorErrorNumber() */
 
 /*
  *  Routine to raise particular Java exceptions from C
diff --git a/java/src/jni/exceptionImp.h b/java/src/jni/exceptionImp.h
index 423e537..5873202 100644
--- a/java/src/jni/exceptionImp.h
+++ b/java/src/jni/exceptionImp.h
@@ -55,20 +55,20 @@ Java_hdf_hdf5lib_exceptions_HDF5LibraryException_printStackTrace0
 
 /*
  * Class:     hdf_hdf5lib_exceptions_HDFLibraryException
- * Method:    getMajorErrorNumber
+ * Method:    _getMajorErrorNumber
  * Signature: ()J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_exceptions_HDF5LibraryException_getMajorErrorNumber
+Java_hdf_hdf5lib_exceptions_HDF5LibraryException__1getMajorErrorNumber
   (JNIEnv *env, jobject obj);
 
 /*
  * Class:     hdf_hdf5lib_exceptions_HDFLibraryException
- * Method:    getMinorErrorNumber
+ * Method:    _getMinorErrorNumber
  * Signature: ()J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_exceptions_HDF5LibraryException_getMinorErrorNumber
+Java_hdf_hdf5lib_exceptions_HDF5LibraryException__1getMinorErrorNumber
   (JNIEnv *env, jobject obj);
 
 #ifdef __cplusplus
diff --git a/java/src/jni/h5aImp.c b/java/src/jni/h5aImp.c
index 13f5207..c0dc182 100644
--- a/java/src/jni/h5aImp.c
+++ b/java/src/jni/h5aImp.c
@@ -966,7 +966,7 @@ Java_hdf_hdf5lib_H5_H5Aget_1info_1by_1idx
         UNPIN_JAVA_STRING(obj_name, aName);
 
         if (status < 0) {
-        h5libraryError(env);
+            h5libraryError(env);
         } /* end if */
         else {
             args[0].z = ainfo.corder_valid;
@@ -1002,7 +1002,7 @@ Java_hdf_hdf5lib_H5_H5Aget_1info_1by_1name
         UNPIN_JAVA_STRING_TWO(obj_name, aName, attr_name, attrName);
 
         if (status < 0) {
-        h5libraryError(env);
+            h5libraryError(env);
         } /* end if */
         else {
             args[0].z = ainfo.corder_valid;
@@ -1166,8 +1166,12 @@ H5A_iterate_cb
                     constructor = CBENVPTR->GetMethodID(CBENVPAR cls, "<init>", "(ZJIJ)V");
                     if (constructor != 0) {
                         cb_info_t = CBENVPTR->NewObjectA(CBENVPAR cls, constructor, args);
-
-                        status = CBENVPTR->CallIntMethod(CBENVPAR visit_callback, mid, g_id, str, cb_info_t, op_data);
+                        if (cb_info_t == NULL) {
+                            printf("FATAL ERROR:  hdf/hdf5lib/structs/H5A_info_t: Creation failed\n");
+                        }
+                        else {
+                            status = CBENVPTR->CallIntMethod(CBENVPAR visit_callback, mid, g_id, str, cb_info_t, op_data);
+                        }
                     } /* end if (constructor != 0) */
                 } /* end if (cls != 0) */
             } /* end if (mid != 0) */
diff --git a/java/src/jni/h5eImp.c b/java/src/jni/h5eImp.c
index 24ddcbc..10a02b0 100644
--- a/java/src/jni/h5eImp.c
+++ b/java/src/jni/h5eImp.c
@@ -508,8 +508,12 @@ H5E_walk_cb
                     constructor = CBENVPTR->GetMethodID(CBENVPAR cls, "<init>", "(JJJILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V");
                     if (constructor != 0) {
                         cb_info_t = CBENVPTR->NewObjectA(CBENVPAR cls, constructor, args);
-
-                        status = CBENVPTR->CallIntMethod(CBENVPAR visit_callback, mid, nindx, cb_info_t, op_data);
+                        if (cb_info_t == NULL) {
+                            printf("FATAL ERROR: hdf/hdf5lib/structs/H5E_error2_t: Creation failed\n");
+                        }
+                        else {
+                            status = CBENVPTR->CallIntMethod(CBENVPAR visit_callback, mid, nindx, cb_info_t, op_data);
+                        }
                     } /* end if (constructor != 0) */
                 } /* end if(cls != 0) */
             } /* end if (mid != 0) */
diff --git a/java/src/jni/h5lImp.c b/java/src/jni/h5lImp.c
index ac71845..f1734fd 100644
--- a/java/src/jni/h5lImp.c
+++ b/java/src/jni/h5lImp.c
@@ -574,8 +574,12 @@ H5L_iterate_cb
                     constructor = CBENVPTR->GetMethodID(CBENVPAR cls, "<init>", "(IZJIJ)V");
                     if (constructor != 0) {
                         cb_info_t = CBENVPTR->NewObjectA(CBENVPAR cls, constructor, args);
-
-                        status = CBENVPTR->CallIntMethod(CBENVPAR visit_callback, mid, g_id, str, cb_info_t, op_data);
+                        if (cb_info_t == NULL) {
+                            printf("FATAL ERROR: hdf/hdf5lib/structs/H5L_info_t: Creation failed\n");
+                        }
+                        else {
+                            status = CBENVPTR->CallIntMethod(CBENVPAR visit_callback, mid, g_id, str, cb_info_t, op_data);
+                        }
                     } /* end if */
                 } /* end if */
             } /* end if */
diff --git a/java/src/jni/h5oImp.c b/java/src/jni/h5oImp.c
index 7665c70..6093e46 100644
--- a/java/src/jni/h5oImp.c
+++ b/java/src/jni/h5oImp.c
@@ -372,41 +372,58 @@ H5O_iterate_cb
                 constructor = CBENVPTR->GetMethodID(CBENVPAR cls, "<init>", "(IIIIJJJJJJ)V");
                 if (constructor != 0) {
                     hdrinfobuf = CBENVPTR->NewObjectA(CBENVPAR cls, constructor, args);
-
-                    args[0].j = (jlong)info->meta_size.obj.index_size;
-                    args[1].j = (jlong)info->meta_size.obj.heap_size;
-                    // get a reference to the H5_ih_info_t class
-                    cls = CBENVPTR->FindClass(CBENVPAR "hdf/hdf5lib/structs/H5_ih_info_t");
-                    if (cls != 0) {
-                        // get a reference to the constructor; the name is <init>
-                        constructor = CBENVPTR->GetMethodID(CBENVPAR cls, "<init>", "(JJ)V");
-                        if (constructor != 0) {
-                            ihinfobuf1 = CBENVPTR->NewObjectA(CBENVPAR cls, constructor, args);
-                            args[0].j = (jlong)info->meta_size.attr.index_size;
-                            args[1].j = (jlong)info->meta_size.attr.heap_size;
-                            ihinfobuf2 = CBENVPTR->NewObjectA(CBENVPAR cls, constructor, args);
-
-                            args[0].j = (jlong)info->fileno;
-                            args[1].j = (jlong)info->addr;
-                            args[2].i = info->type;
-                            args[3].i = (jint)info->rc;
-                            args[4].j = (jlong)info->num_attrs;
-                            args[5].j = info->atime;
-                            args[6].j = info->mtime;
-                            args[7].j = info->ctime;
-                            args[8].j = info->btime;
-                            args[9].l = hdrinfobuf;
-                            args[10].l = ihinfobuf1;
-                            args[11].l = ihinfobuf2;
-                            // get a reference to the H5O_info_t class
-                            cls = CBENVPTR->FindClass(CBENVPAR "hdf/hdf5lib/structs/H5O_info_t");
-                            if (cls != 0) {
-                                // get a reference to the constructor; the name is <init>
-                                constructor = CBENVPTR->GetMethodID(CBENVPAR cls, "<init>", "(JJIIJJJJJLhdf/hdf5lib/structs/H5O_hdr_info_t;Lhdf/hdf5lib/structs/H5_ih_info_t;Lhdf/hdf5lib/structs/H5_ih_info_t;)V");
-                                if (constructor != 0) {
-                                    cb_info_t = CBENVPTR->NewObjectA(CBENVPAR cls, constructor, args);
-
-                                    status = CBENVPTR->CallIntMethod(CBENVPAR visit_callback, mid, g_id, str, cb_info_t, op_data);
+                    if (hdrinfobuf == NULL) {
+                        printf("H5O_iterate_cb ERROR: hdf/hdf5lib/structs/H5O_hdr_info_t: Creation failed\n");
+                    }
+                    else {
+                        args[0].j = (jlong)info->meta_size.obj.index_size;
+                        args[1].j = (jlong)info->meta_size.obj.heap_size;
+                        // get a reference to the H5_ih_info_t class
+                        cls = CBENVPTR->FindClass(CBENVPAR "hdf/hdf5lib/structs/H5_ih_info_t");
+                        if (cls != 0) {
+                            // get a reference to the constructor; the name is <init>
+                            constructor = CBENVPTR->GetMethodID(CBENVPAR cls, "<init>", "(JJ)V");
+                            if (constructor != 0) {
+                                ihinfobuf1 = CBENVPTR->NewObjectA(CBENVPAR cls, constructor, args);
+                                if (ihinfobuf1 == NULL) {
+                                    printf("H5O_iterate_cb ERROR: hdf/hdf5lib/structs/H5_ih_info_t: Creation failed\n");
+                                }
+                                else {
+                                    args[0].j = (jlong)info->meta_size.attr.index_size;
+                                    args[1].j = (jlong)info->meta_size.attr.heap_size;
+                                    ihinfobuf2 = CBENVPTR->NewObjectA(CBENVPAR cls, constructor, args);
+                                    if (ihinfobuf2 == NULL) {
+                                        printf("H5O_iterate_cb ERROR: hdf/hdf5lib/structs/H5_ih_info_t: Creation failed\n");
+                                    }
+                                    else {
+                                        args[0].j = (jlong)info->fileno;
+                                        args[1].j = (jlong)info->addr;
+                                        args[2].i = info->type;
+                                        args[3].i = (jint)info->rc;
+                                        args[4].j = (jlong)info->num_attrs;
+                                        args[5].j = info->atime;
+                                        args[6].j = info->mtime;
+                                        args[7].j = info->ctime;
+                                        args[8].j = info->btime;
+                                        args[9].l = hdrinfobuf;
+                                        args[10].l = ihinfobuf1;
+                                        args[11].l = ihinfobuf2;
+                                        // get a reference to the H5O_info_t class
+                                        cls = CBENVPTR->FindClass(CBENVPAR "hdf/hdf5lib/structs/H5O_info_t");
+                                        if (cls != 0) {
+                                            // get a reference to the constructor; the name is <init>
+                                            constructor = CBENVPTR->GetMethodID(CBENVPAR cls, "<init>", "(JJIIJJJJJLhdf/hdf5lib/structs/H5O_hdr_info_t;Lhdf/hdf5lib/structs/H5_ih_info_t;Lhdf/hdf5lib/structs/H5_ih_info_t;)V");
+                                            if (constructor != 0) {
+                                                cb_info_t = CBENVPTR->NewObjectA(CBENVPAR cls, constructor, args);
+                                                if (cb_info_t == NULL) {
+                                                    printf("H5O_iterate_cb ERROR: hdf/hdf5lib/structs/H5O_info_t: Creation failed\n");
+                                                }
+                                                else {
+                                                    status = CBENVPTR->CallIntMethod(CBENVPAR visit_callback, mid, g_id, str, cb_info_t, op_data);
+                                                }
+                                            }
+                                        }
+                                    }
                                 }
                             }
                         }