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

Guard against ContextNotActiveException in ResteasyReactiveContextLocaleResolver #23201

Merged
merged 1 commit into from
Jan 27, 2022
Merged

Guard against ContextNotActiveException in ResteasyReactiveContextLocaleResolver #23201

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
15 changes: 10 additions & 5 deletions ...a/io/quarkus/hibernate/validator/runtime/jaxrs/ResteasyReactiveContextLocaleResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
package io.quarkus.hibernate.validator.runtime.jaxrs;

import javax.enterprise.context.RequestScoped;
import javax.inject.Singleton;
import javax.ws.rs.core.HttpHeaders;

import io.quarkus.arc.Arc;
import io.quarkus.arc.DefaultBean;

@Singleton
Expand All @@ -18,11 +20,14 @@ public ResteasyReactiveContextLocaleResolver(HttpHeaders headers) {

@Override
protected HttpHeaders getHeaders() {
try {
headers.getLength(); // this forces the creation of the actual object which will fail if there is no request in flight
return headers;
} catch (IllegalStateException e) {
return null;
if (Arc.container().getActiveContext(RequestScoped.class) != null) { // only try to obtain headers if there is a request scope
try {
headers.getLength(); // this forces the creation of the actual object which will fail if there is no request in flight
return headers;
} catch (IllegalStateException ignored) {

}
}
return null;
}
}