Merge #667 from branch '666-fixMemoryLeak' of github.com:metafacture/metafacture-core

Author: dr0i

metafix/src/main/java/org/metafacture/metafix/maps/RdfMap.java

@@ -31,6 +31,7 @@
 import org.apache.jena.riot.RDFDataMgr;
 import org.apache.jena.shared.PropertyNotFoundException;
 
+import java.io.Closeable;
 import java.io.IOException;
 import java.net.HttpURLConnection;
 import java.net.URL;
@@ -56,7 +57,7 @@
  *
  * @see org.metafacture.metamorph.maps.FileMap
  */
-public final class RdfMap extends AbstractReadOnlyMap<String, String> {
+public final class RdfMap extends AbstractReadOnlyMap<String, String> implements Closeable {
 
     public static final String SELECT = "select";
     public static final String TARGET = "target";
@@ -394,6 +395,12 @@ private String read(final String url) throws IOException {
         return conn.getURL().toString();
     }
 
+    @Override
+    public void close() {
+        map.clear();
+        model.close();
+    }
+
     private enum Select {
         SUBJECT, OBJECT, DEFAULT
     }

metamorph/src/main/java/org/metafacture/metamorph/maps/FileMap.java

@@ -21,6 +21,7 @@
 import org.metafacture.metamorph.api.helpers.AbstractReadOnlyMap;
 
 import java.io.BufferedReader;
+import java.io.Closeable;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -60,7 +61,7 @@
  *
  * @author Markus Michael Geipel
  */
-public final class FileMap extends AbstractReadOnlyMap<String, String> {
+public final class FileMap extends AbstractReadOnlyMap<String, String> implements Closeable {
 
     private final FileOpener fileOpener = new FileOpener();
     private final Map<String, String> map = new HashMap<>();
@@ -290,4 +291,9 @@ public Set<String> keySet() {
         return Collections.unmodifiableSet(map.keySet());
     }
 
+    @Override
+    public void close() throws IOException {
+        map.clear();
+        fileOpener.closeStream();
+    }
 }