Skip to content
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

fix problem with exception handling reported in #1682 #1704

Merged
merged 1 commit into from
Jul 11, 2023
Merged

fix problem with exception handling reported in #1682 #1704

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
13 changes: 9 additions & 4 deletions ...e-core/src/main/java/org/hibernate/reactive/query/spi/ReactiveAbstractSelectionQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,13 +184,18 @@ public CompletionStage<R> getReactiveSingleResultOrNull() {
}

private R convertException(Throwable t) {
if ( t instanceof CompletionException ) {
t = t.getCause();
if ( t instanceof CompletionException && t.getCause() != null ) {
return convertException( t.getCause() );
}
if ( t instanceof HibernateException ) {
else if ( t instanceof HibernateException ) {
throw getSession().getExceptionConverter().convert( (HibernateException) t, getLockOptions() );
}
throw getSession().getExceptionConverter().convert( (RuntimeException) t, getLockOptions() );
else if ( t instanceof RuntimeException ) {
throw getSession().getExceptionConverter().convert( (RuntimeException) t, getLockOptions() );
}
else {
throw new CompletionException( t );
}
}

private LockOptions getLockOptions() {
Expand Down