1 files changed, 85 insertions, 30 deletions

diff --git a/java/src/jni/h5util.c b/java/src/jni/h5util.c
index e39b342..acf57c8 100644
--- a/java/src/jni/h5util.c
+++ b/java/src/jni/h5util.c
@@ -2009,6 +2009,60 @@ Java_hdf_hdf5lib_H5_H5AreadVL
 } /* end Java_hdf_hdf5lib_H5_H5AreadVL */
 
 /*
+ * Class:     hdf_hdf5lib_H5
+ * Method:    H5AreadComplex
+ * Signature: (JJ[Ljava/lang/String;)I
+ */
+JNIEXPORT jint JNICALL
+Java_hdf_hdf5lib_H5_H5AreadComplex
+(JNIEnv *env, jclass clss, jlong attr_id, jlong mem_type_id, jobjectArray buf)
+{
+    herr_t      status = -1;
+    int         i;
+    int         n;
+    char       *rdata;
+    size_t      max_len = 0;
+    size_t      size;
+    h5str_t     h5str;
+    hid_t       p_type = -1;
+    jstring     jstr;
+
+    p_type = H5Tget_native_type(mem_type_id, H5T_DIR_DEFAULT);
+    size = (((H5Tget_size(mem_type_id))>(H5Tget_size(p_type))) ? (H5Tget_size(mem_type_id)) : (H5Tget_size(p_type)));
+    H5Tclose(p_type);
+
+    n = ENVPTR->GetArrayLength(ENVPAR buf);
+    rdata = (char *)malloc((size_t)n * size);
+    if (rdata == NULL) {
+        h5JNIFatalError(env, "H5AreadComplex:  failed to allocate buff for read");
+    } /* end if */
+    else {
+        status = H5Aread(attr_id, mem_type_id, rdata);
+        if (status < 0) {
+            h5JNIFatalError(env, "H5AreadComplex: failed to read data");
+        } /* end if */
+        else {
+            HDmemset(&h5str, 0, sizeof(h5str_t));
+            h5str_new(&h5str, 4 * size);
+            if (h5str.s == NULL) {
+                h5JNIFatalError(env, "H5AreadComplex:  failed to allocate string buf");
+            } /* end if */
+            else {
+                for (i = 0; i < n; i++) {
+                    h5str.s[0] = '\0';
+                    h5str_sprintf(&h5str, attr_id, mem_type_id, rdata + ((size_t)i * size), 0);
+                    jstr = ENVPTR->NewStringUTF(ENVPAR h5str.s);
+                    ENVPTR->SetObjectArrayElement(ENVPAR buf, i, jstr);
+                } /* end for */
+            }  /* end else */
+            h5str_free(&h5str);
+        }  /* end else */
+        HDfree(rdata);
+    }  /* end else */
+    return status;
+}
+
+/*
  * Copies the content of one dataset to another dataset
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Acopy
@@ -2580,49 +2634,50 @@ Java_hdf_hdf5lib_H5_H5export_1dataset
         h5nullArgument(env, "HDF5Library_export_data:  object_path is NULL");
     } /* end else if */
     else {
-        PIN_JAVA_STRING0(file_name, fileName);
+        PIN_JAVA_STRING(file_name, fileName);
+        if (fileName != NULL) {
+            file_id = H5Fopen(fileName, (unsigned)H5F_ACC_RDWR, (hid_t)H5P_DEFAULT);
 
-        file_id = H5Fopen(fileName, (unsigned)H5F_ACC_RDWR, (hid_t)H5P_DEFAULT);
+            UNPIN_JAVA_STRING(file_name, fileName);
 
-        UNPIN_JAVA_STRING(file_name, fileName);
-
-        if (file_id < 0) {
-            /* throw exception */
-            h5libraryError(env);
-        } /* end if */
-        else {
-            object_name = ENVPTR->GetStringUTFChars(ENVPAR object_path, &isCopy2);
-            if (object_name == NULL) {
-                h5JNIFatalError( env, "H5Dopen:  object name not pinned");
+            if (file_id < 0) {
+                /* throw exception */
+                h5libraryError(env);
             } /* end if */
             else {
-                dataset_id = H5Dopen2(file_id, object_name, H5P_DEFAULT);
-
-                ENVPTR->ReleaseStringUTFChars(ENVPAR object_path, object_name);
-
-                if (dataset_id < 0) {
-                    H5Fclose(file_id);
-                    h5libraryError(env);
+                object_name = ENVPTR->GetStringUTFChars(ENVPAR object_path, &isCopy2);
+                if (object_name == NULL) {
+                    h5JNIFatalError( env, "H5Dopen:  object name not pinned");
                 } /* end if */
                 else {
-                    file_export = ENVPTR->GetStringUTFChars(ENVPAR file_export_name, 0);
-                    stream = HDfopen(file_export, "w+");
-                    ENVPTR->ReleaseStringUTFChars(ENVPAR file_export_name, file_export);
+                    dataset_id = H5Dopen2(file_id, object_name, H5P_DEFAULT);
 
-                    ret_val = h5str_dump_simple_dset(stream, dataset_id, binary_order);
+                    ENVPTR->ReleaseStringUTFChars(ENVPAR object_path, object_name);
 
-                    if (stream)
-                        HDfclose(stream);
+                    if (dataset_id < 0) {
+                        H5Fclose(file_id);
+                        h5libraryError(env);
+                    } /* end if */
+                    else {
+                        file_export = ENVPTR->GetStringUTFChars(ENVPAR file_export_name, 0);
+                        stream = HDfopen(file_export, "w+");
+                        ENVPTR->ReleaseStringUTFChars(ENVPAR file_export_name, file_export);
 
-                    H5Dclose(dataset_id);
+                        ret_val = h5str_dump_simple_dset(stream, dataset_id, binary_order);
 
-                    H5Fclose(file_id);
+                        if (stream)
+                            HDfclose(stream);
 
-                    if (ret_val < 0)
-                        h5libraryError(env);
+                        H5Dclose(dataset_id);
+
+                        H5Fclose(file_id);
+
+                        if (ret_val < 0)
+                            h5libraryError(env);
+                    } /* end else */
                 } /* end else */
             } /* end else */
-        } /* end else */
+        }
     } /* end else */
 } /* end Java_hdf_hdf5lib_H5_H5export_1dataset */