attempt to fix file not closed when using FILE_READ

and remove now unused AutoCloseInputStream

h2/src/main/org/h2/expression/Function.java

@@ -44,7 +44,6 @@ import org.h2.table.Table;
 import org.h2.table.TableFilter;
 import org.h2.tools.CompressTool;
 import org.h2.tools.Csv;
-import org.h2.util.AutoCloseInputStream;
 import org.h2.util.DateTimeUtils;
 import org.h2.util.IOUtils;
 import org.h2.util.JdbcUtils;
@@ -1637,18 +1636,21 @@ public class Function extends Expression implements FunctionCall {
             boolean blob = args.length == 1;
             try {
                 long fileLength = FileUtils.size(fileName);
-                InputStream in = new AutoCloseInputStream(
-                        FileUtils.newInputStream(fileName));
-                if (blob) {
-                    result = database.getLobStorage().createBlob(in, fileLength);
-                } else {
-                    Reader reader;
-                    if (v1 == ValueNull.INSTANCE) {
-                        reader = new InputStreamReader(in);
+                final InputStream in = FileUtils.newInputStream(fileName);
+                try {
+                    if (blob) {
+                        result = database.getLobStorage().createBlob(in, fileLength);
                     } else {
-                        reader = new InputStreamReader(in, v1.getString());
+                        Reader reader;
+                        if (v1 == ValueNull.INSTANCE) {
+                            reader = new InputStreamReader(in);
+                        } else {
+                            reader = new InputStreamReader(in, v1.getString());
+                        }
+                        result = database.getLobStorage().createClob(reader, fileLength);
                     }
-                    result = database.getLobStorage().createClob(reader, fileLength);
+                } finally {
+                    IOUtils.closeSilently(in);
                 }
                 session.addTemporaryLob(result);
             } catch (IOException e) {

h2/src/main/org/h2/util/AutoCloseInputStream.java

-/*
- * Copyright 2004-2014 H2 Group. Multiple-Licensed under the MPL 2.0,
- * and the EPL 1.0 (http://h2database.com/html/license.html).
- * Initial Developer: H2 Group
- */
-package org.h2.util;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * This input stream wrapper closes the base input stream when fully read.
- */
-public class AutoCloseInputStream extends InputStream {
-
-    private final InputStream in;
-    private boolean closed;
-
-    /**
-     * Create a new input stream.
-     *
-     * @param in the input stream
-     */
-    public AutoCloseInputStream(InputStream in) {
-        this.in = in;
-    }
-
-    private int autoClose(int x) throws IOException {
-        if (x < 0) {
-            close();
-        }
-        return x;
-    }
-
-    @Override
-    public void close() throws IOException {
-        if (!closed) {
-            in.close();
-            closed = true;
-        }
-    }
-
-    @Override
-    public int read(byte[] b, int off, int len) throws IOException {
-        return closed ? -1 : autoClose(in.read(b, off, len));
-    }
-
-    @Override
-    public int read(byte[] b) throws IOException {
-        return closed ? -1 : autoClose(in.read(b));
-    }
-
-    @Override
-    public int read() throws IOException {
-        return closed ? -1 : autoClose(in.read());
-    }
-
-}