Skip to content

[API] Fix throwing null exception and add error prone suppression to runSafely functions #5259

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rdblue merged 1 commit into from
Jul 12, 2022
Merged

[API] Fix throwing null exception and add error prone suppression to runSafely functions #5259

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions api/src/main/java/org/apache/iceberg/util/ExceptionUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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);
Copy link
Contributor Author

@kbendick kbendick Jul 12, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I moved this log because we're not suppressing e in the other block.

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);
}
}
}
Expand Down