Avoid closing the file descriptor when sending directly a FileChannel/RandomAccessFile.

Motivation:

Sending a FileChannel/RandomAccessFile should not close it, currently unlike for sending file region, it is closed by the ChunkedWriteHandle.

Changes:

Override ChunkedNioFile to prevent the file descriptor to be closed

Author: vietj

vertx-core/src/main/java/io/vertx/core/net/impl/VertxConnection.java

@@ -499,7 +499,12 @@ public ChannelFuture sendFile(FileChannel fc, long offset, long length) {
     if (!supportsFileRegion()) {
       // Cannot use zero-copy
       try {
-        writeToChannel(new ChunkedNioFile(fc, offset, length, 8192), writeFuture);
+        writeToChannel(new ChunkedNioFile(fc, offset, length, 8192) {
+          @Override
+          public void close() {
+            // The called is responsible for closing the file
+          }
+        }, writeFuture);
       } catch (IOException e) {
         return chctx.newFailedFuture(e);
       }

vertx-core/src/test/java/io/vertx/tests/http/sendfile/Http1xSendFileTest.java

@@ -10,7 +10,6 @@
  */
 package io.vertx.tests.http.sendfile;
 
-import io.vertx.core.Future;
 import io.vertx.core.http.HttpClientResponse;
 import io.vertx.core.http.HttpHeaders;
 import io.vertx.core.http.HttpServerOptions;

vertx-core/src/test/java/io/vertx/tests/http/sendfile/HttpSendFileTest.java

@@ -354,7 +354,7 @@ public void testSendFileWithRandomAccessFileRange() throws Exception {
 
   private RandomAccessFile testSendFileWithFileChannel(int flen, BiFunction<RandomAccessFile, HttpServerResponse, Future<?>> sender,
                                                        String expectedContentType, long expectedLength) throws Exception {
-    Assume.assumeTrue(this.getClass() == Http1xSendFileTest.class);
+    Assume.assumeTrue(this instanceof Http1xSendFileTest);
     File file = TestUtils.tmpFile(".dat", flen);
     RandomAccessFile raf = new RandomAccessFile(file, "r");
     server.requestHandler(req -> sender.apply(raf, req.response()).onComplete(onSuccess(v -> testComplete())));