From 2f4832fe09e85d8ef083c50caa9b50913cdb5400 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Mon, 6 Aug 2018 09:23:21 -0500
Subject: HDFFV-10544 add class name to error text

---
 java/src/jni/exceptionImp.c | 2 +-
 java/src/jni/h5aImp.c       | 2 +-
 java/src/jni/h5eImp.c       | 2 +-
 java/src/jni/h5lImp.c       | 2 +-
 java/src/jni/h5oImp.c       | 8 ++++----
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/java/src/jni/exceptionImp.c b/java/src/jni/exceptionImp.c
index e122eb2..69f8dde 100644
--- a/java/src/jni/exceptionImp.c
+++ b/java/src/jni/exceptionImp.c
@@ -88,7 +88,7 @@ typedef struct H5E_num_t {
     }                                                                       \
     ex = ENVPTR->NewObjectA (ENVPAR jc, jm, (jvalue*)(args));               \
     if (ex == NULL) {                                                       \
-        printf("FATAL ERROR:  Creation failed\n");                          \
+        printf("FATAL ERROR:  %s: Creation failed\n", (className));         \
         return JNI_FALSE;                                                   \
     }                                                                       \
     if (ENVPTR->Throw(ENVPAR (jthrowable)ex) < 0) {                         \
diff --git a/java/src/jni/h5aImp.c b/java/src/jni/h5aImp.c
index 437f25f..c0dc182 100644
--- a/java/src/jni/h5aImp.c
+++ b/java/src/jni/h5aImp.c
@@ -1167,7 +1167,7 @@ H5A_iterate_cb
                     if (constructor != 0) {
                         cb_info_t = CBENVPTR->NewObjectA(CBENVPAR cls, constructor, args);
                         if (cb_info_t == NULL) {
-                            printf("FATAL ERROR:  Creation failed\n");
+                            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);
diff --git a/java/src/jni/h5eImp.c b/java/src/jni/h5eImp.c
index df7e35f..10a02b0 100644
--- a/java/src/jni/h5eImp.c
+++ b/java/src/jni/h5eImp.c
@@ -509,7 +509,7 @@ H5E_walk_cb
                     if (constructor != 0) {
                         cb_info_t = CBENVPTR->NewObjectA(CBENVPAR cls, constructor, args);
                         if (cb_info_t == NULL) {
-                            printf("FATAL ERROR:  Creation failed\n");
+                            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);
diff --git a/java/src/jni/h5lImp.c b/java/src/jni/h5lImp.c
index 7391490..f1734fd 100644
--- a/java/src/jni/h5lImp.c
+++ b/java/src/jni/h5lImp.c
@@ -575,7 +575,7 @@ H5L_iterate_cb
                     if (constructor != 0) {
                         cb_info_t = CBENVPTR->NewObjectA(CBENVPAR cls, constructor, args);
                         if (cb_info_t == NULL) {
-                            printf("FATAL ERROR:  Creation failed\n");
+                            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);
diff --git a/java/src/jni/h5oImp.c b/java/src/jni/h5oImp.c
index b7bcdb6..3b4c068 100644
--- a/java/src/jni/h5oImp.c
+++ b/java/src/jni/h5oImp.c
@@ -373,7 +373,7 @@ H5O_iterate_cb
                 if (constructor != 0) {
                     hdrinfobuf = CBENVPTR->NewObjectA(CBENVPAR cls, constructor, args);
                     if (ihinfobuf2 == NULL) {
-                        printf("FATAL ERROR:  Creation failed\n");
+                        printf("FATAL ERROR: hdf/hdf5lib/structs/H5O_hdr_info_t: Creation failed\n");
                     }
                     else {
                         args[0].j = (jlong)info->meta_size.obj.index_size;
@@ -386,14 +386,14 @@ H5O_iterate_cb
                             if (constructor != 0) {
                                 ihinfobuf1 = CBENVPTR->NewObjectA(CBENVPAR cls, constructor, args);
                                 if (ihinfobuf1 == NULL) {
-                                    printf("FATAL ERROR:  Creation failed\n");
+                                    printf("FATAL 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("FATAL ERROR:  Creation failed\n");
+                                        printf("FATAL ERROR: hdf/hdf5lib/structs/H5_ih_info_t: Creation failed\n");
                                     }
                                     else {
                                         args[0].j = (jlong)info->fileno;
@@ -416,7 +416,7 @@ H5O_iterate_cb
                                             if (constructor != 0) {
                                                 cb_info_t = CBENVPTR->NewObjectA(CBENVPAR cls, constructor, args);
                                                 if (cb_info_t == NULL) {
-                                                    printf("FATAL ERROR:  Creation failed\n");
+                                                    printf("FATAL 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);
-- 
cgit v0.12