Merge pull request #340 from raedma/master

+ Fix and test for #338

jhdf/src/main/java/io/jhdf/dataset/DatasetReader.java

@@ -11,7 +11,6 @@
 
 import io.jhdf.object.datatype.DataType;
 import io.jhdf.storage.HdfBackingStorage;
-
 import java.lang.reflect.Array;
 import java.nio.ByteBuffer;
 
@@ -63,7 +62,7 @@ public static Object readDataset(DataType type, ByteBuffer buffer, int[] dimensi
 
 		final Object data = type.fillData(buffer, dimensions, hdfBackingStorage);
 
-		if (isScalar) {
+		if (isScalar && data.getClass().isArray()) {
 			return Array.get(data, 0);
 		} else {
 			return data;

jhdf/src/test/java/io/jhdf/attribute/CompoundScalarAttributeTest.java

@@ -0,0 +1,61 @@
+/*
+ * This file is part of jHDF. A pure Java library for accessing HDF5 files.
+ *
+ * http://jhdf.io
+ *
+ * Copyright (c) 2022 James Mudd
+ *
+ * MIT License see 'LICENSE' file
+ */
+package io.jhdf.attribute;
+
+import io.jhdf.HdfFile;
+import static io.jhdf.TestUtils.loadTestHdfFile;
+import io.jhdf.api.Attribute;
+import io.jhdf.api.Node;
+import java.util.Map;
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+class CompoundScalarAttributeTest {
+
+	private static final String HDF5_TEST_FILE_NAME = "test_compound_scalar_attribute.hdf5";
+
+	private static HdfFile hdfFile;
+
+	@BeforeAll
+	static void setup() throws Exception {
+		hdfFile = loadTestHdfFile(HDF5_TEST_FILE_NAME);
+	}
+
+	@AfterAll
+	static void tearDown() {
+		hdfFile.close();
+	}
+
+	@Test
+	void testReadAttribute() {
+
+            Node node = hdfFile.getByPath("GROUP");
+            Attribute attribute = node.getAttribute("VERSION");
+
+            Object data = attribute.getData();
+
+            Map<String,int[]> dataImpl = (Map<String,int[]>)data;
+
+            String key = "myMajor";
+            assertTrue(dataImpl.containsKey(key));
+            assertEquals(1,dataImpl.get(key)[0]);
+
+            key = "myMinor";
+            assertTrue(dataImpl.containsKey(key));
+            assertEquals(0,dataImpl.get(key)[0]);
+
+            key = "myPatch";
+            assertTrue(dataImpl.containsKey(key));
+            assertEquals(0,dataImpl.get(key)[0]);
+	}
+}