Merge pull request #188 from ate47/fix_kcat_closer

Fix issue with closer if the diffcat isn't used but an error is thrown
rdfhdt · Feb 1, 2023 · a0d4dbf · a0d4dbf
2 parents 4e823ec + aba805e
commit a0d4dbf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/hdt-java-core/src/main/java/org/rdfhdt/hdt/dictionary/impl/kcat/KCatImpl.java b/hdt-java-core/src/main/java/org/rdfhdt/hdt/dictionary/impl/kcat/KCatImpl.java
@@ -229,7 +229,7 @@ public KCatImpl(List<String> hdtFileNames, List<? extends Bitmap> deleteBitmaps,
 				throw t;
 			} finally {
 				try {
-					Closer.closeAll((Object[]) deleteBitmapTriples);
+					Closer.closeAll((Object) deleteBitmapTriples);
 				} finally {
 					for (HDT hdt : hdts) {
 						IOUtil.closeQuietly(hdt);

diff --git a/hdt-java-core/src/main/java/org/rdfhdt/hdt/util/io/Closer.java b/hdt-java-core/src/main/java/org/rdfhdt/hdt/util/io/Closer.java
@@ -4,7 +4,6 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -20,7 +19,11 @@ public class Closer implements Iterable<Closeable>, Closeable {
 	private final List<Closeable> list;
 
 	private Closer(Object... other) {
-		list = new ArrayList<>(other.length);
+		if (other != null) {
+			list = new ArrayList<>(other.length);
+		} else {
+			list = new ArrayList<>();
+		}
 		with(other);
 	}