Allow IOUtils.close() to rethrow exception if passed in

Author: dakrone

libs/elasticsearch-core/src/main/java/org/elasticsearch/core/internal/io/IOUtils.java

@@ -41,25 +41,52 @@ private IOUtils() {
     }
 
     /**
-     * Closes all given <tt>Closeable</tt>s. Some of the <tt>Closeable</tt>s may be null; they are ignored. After everything is closed, the
-     * method either throws the first exception it hit while closing, or completes normally if there were no exceptions.
+     * Closes all given <tt>Closeable</tt>s. Some of the <tt>Closeable</tt>s may be null; they are
+     * ignored. After everything is closed, the method either throws the first exception it hit
+     * while closing with other exceptions added as suppressed, or completes normally if there were
+     * no exceptions.
      *
      * @param objects objects to close
      */
     public static void close(final Closeable... objects) throws IOException {
-        close(Arrays.asList(objects));
+        close(null, Arrays.asList(objects));
     }
 
     /**
-     * Closes all given {@link Closeable}s.
+     * Closes all given <tt>Closeable</tt>s. Some of the <tt>Closeable</tt>s may be null; they are
+     * ignored. After everything is closed, the method adds any exceptions as suppressed to the
+     * original exception, or throws the first exception it hit if {@code Exception} is null. If
+     * no exceptions are encountered and the passed in exception is null, it completes normally.
      *
      * @param objects objects to close
+     */
+    public static void close(final Exception e, final Closeable... objects) throws IOException {
+        close(e, Arrays.asList(objects));
+    }
+
+    /**
+     * Closes all given <tt>Closeable</tt>s. Some of the <tt>Closeable</tt>s may be null; they are
+     * ignored. After everything is closed, the method either throws the first exception it hit
+     * while closing with other exceptions added as suppressed, or completes normally if there were
+     * no exceptions.
      *
-     * @see #close(Closeable...)
+     * @param objects objects to close
      */
     public static void close(final Iterable<? extends Closeable> objects) throws IOException {
-        Exception ex = null;
+        close(null, objects);
+    }
 
+    /**
+     * Closes all given {@link Closeable}s. If a non-null exception is passed in, or closing a
+     * stream causes an exception, throws the exception with other {@link RuntimeException} or
+     * {@link IOException} exceptions added as suppressed.
+     *
+     * @param ex existing Exception to add exceptions occurring during close to
+     * @param objects objects to close
+     *
+     * @see #close(Closeable...)
+     */
+    public static void close(Exception ex, final Iterable<? extends Closeable> objects) throws IOException {
         for (final Closeable object : objects) {
             try {
                 if (object != null) {

libs/elasticsearch-core/src/main/java/org/elasticsearch/core/internal/io/Streams.java

@@ -43,11 +43,11 @@ public class Streams {
      * @return the number of bytes copied
      * @throws IOException in case of I/O errors
      */
-    public static long copy(InputStream in, OutputStream out) throws IOException {
+    public static long copy(final InputStream in, final OutputStream out) throws IOException {
         Objects.requireNonNull(in, "No InputStream specified");
         Objects.requireNonNull(out, "No OutputStream specified");
         final byte[] buffer = new byte[8192];
-        boolean success = false;
+        Exception err = null;
         try {
             long byteCount = 0;
             int bytesRead;
@@ -56,14 +56,12 @@ public static long copy(InputStream in, OutputStream out) throws IOException {
                 byteCount += bytesRead;
             }
             out.flush();
-            success = true;
             return byteCount;
+        } catch (IOException | RuntimeException e) {
+            err = e;
+            throw e;
         } finally {
-            if (success) {
-                IOUtils.close(in, out);
-            } else {
-                IOUtils.closeWhileHandlingException(in, out);
-            }
+            IOUtils.close(err, in, out);
         }
     }
 }

libs/elasticsearch-core/src/main/java9/org/elasticsearch/core/internal/io/Streams.java

@@ -41,53 +41,17 @@ public abstract class Streams {
      * @return the number of bytes copied
      * @throws IOException in case of I/O errors
      */
-    public static long copy(InputStream in, OutputStream out) throws IOException {
-        boolean success = false;
+    public static long copy(final InputStream in, final OutputStream out) throws IOException {
+        Exception err = null;
         try {
             final long byteCount = in.transferTo(out);
             out.flush();
-            success = true;
             return byteCount;
+        } catch (IOException | RuntimeException e) {
+            err = e;
+            throw e;
         } finally {
-            if (success) {
-                Exception ex = null;
-                try {
-                    in.close();
-                } catch (IOException | RuntimeException e) {
-                    ex = e;
-                }
-
-                try {
-                    out.close();
-                } catch (IOException | RuntimeException e) {
-                    if (ex == null) {
-                        ex = e;
-                    } else {
-                        ex.addSuppressed(e);
-                    }
-                }
-
-                if (ex != null) {
-                    if (ex instanceof IOException) {
-                        throw (IOException) ex;
-                    } else {
-                        throw (RuntimeException) ex;
-                    }
-                }
-            } else {
-                try {
-                    in.close();
-                } catch (IOException | RuntimeException e) {
-                    // empty
-                }
-
-                try {
-                    out.close();
-                } catch (IOException | RuntimeException e) {
-                    // empty
-                }
-            }
+            IOUtils.close(err, in, out);
         }
-
     }
 }