From 0f7142ca31fb6d71086227a8adc79e8d05b8cf17 Mon Sep 17 00:00:00 2001
From: Kyle Bendickson <kjbendickson@gmail.com>
Date: Mon, 11 Jul 2022 12:49:45 -0700
Subject: [PATCH] API - Fix throwing null exception in runSafely and suppress
 error prone warning

---
 api/src/main/java/org/apache/iceberg/util/ExceptionUtil.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/api/src/main/java/org/apache/iceberg/util/ExceptionUtil.java b/api/src/main/java/org/apache/iceberg/util/ExceptionUtil.java
index 76a1a1c97c4f..553d9ca22563 100644
--- a/api/src/main/java/org/apache/iceberg/util/ExceptionUtil.java
+++ b/api/src/main/java/org/apache/iceberg/util/ExceptionUtil.java
@@ -78,6 +78,7 @@ public static <R, E1 extends Exception, E2 extends Exception> R runSafely(
     return runSafely(block, catchBlock, finallyBlock, e1Class, e2Class, RuntimeException.class);
   }
 
+  @SuppressWarnings("Finally")
   public static <R, E1 extends Exception, E2 extends Exception, E3 extends Exception> R runSafely(
       Block<R, E1, E2, E3> block,
       CatchBlock catchBlock,
@@ -113,15 +114,15 @@ public static <R, E1 extends Exception, E2 extends Exception, E3 extends Excepti
         try {
           finallyBlock.run();
         } catch (Exception e) {
-          LOG.warn("Suppressing failure in finally block", e);
           if (failure != null) {
+            LOG.warn("Suppressing failure in finally block", e);
             failure.addSuppressed(e);
           } else {
             tryThrowAs(e, e1Class);
             tryThrowAs(e, e2Class);
             tryThrowAs(e, e3Class);
             tryThrowAs(e, RuntimeException.class);
-            throw new RuntimeException("Unknown exception in finally block", failure);
+            throw new RuntimeException("Unknown exception in finally block", e);
           }
         }
       }