Merge pull request #4521 from nverwer/fix-resource-leak

fix resource leak (and file lock)

Author: line-o

exist-core/src/main/java/org/exist/xquery/value/BinaryValueFromFile.java

@@ -49,6 +49,7 @@
 public class BinaryValueFromFile extends BinaryValue {
 
     private final Path file;
+    private final RandomAccessFile fileHandle;
     private final FileChannel channel;
     private final MappedByteBuffer buf;
     private final Optional<BiConsumer<Boolean, Path>> closeListener;
@@ -61,7 +62,8 @@ protected BinaryValueFromFile(final Expression expression, final BinaryValueMana
         super(expression, manager, binaryValueType);
         try {
             this.file = file;
-            this.channel = new RandomAccessFile(file.toFile(), "r").getChannel();
+            this.fileHandle = new RandomAccessFile(file.toFile(), "r");
+            this.channel = fileHandle.getChannel();
             this.buf = channel.map(MapMode.READ_ONLY, 0, channel.size());
             this.closeListener = closeListener;
         } catch (final IOException ioe) {
@@ -129,6 +131,7 @@ public void close() throws IOException {
         boolean closed = false;
         try {
             channel.close();
+            fileHandle.close();
             closed = true;
         } finally {
             final boolean finalClosed = closed;