bug fix: prevent circular loop in the error resolver, which would complain in logs

This commit is contained in:
Gauthier Roebroeck 2019-10-29 18:28:34 +08:00
parent e1d80e505a
commit 0be3bb4b84

View file

@ -9,10 +9,10 @@ import javax.servlet.http.HttpServletRequest
@Component
class SPAErrorViewResolver : ErrorViewResolver {
override fun resolveErrorView(request: HttpServletRequest, status: HttpStatus, model: MutableMap<String, Any>): ModelAndView =
if (status == HttpStatus.NOT_FOUND) {
ModelAndView("/", HttpStatus.TEMPORARY_REDIRECT)
} else {
ModelAndView("/error", status)
override fun resolveErrorView(request: HttpServletRequest, status: HttpStatus, model: MutableMap<String, Any>): ModelAndView? =
when {
request.requestURL.toString() == "/error" -> null
status == HttpStatus.NOT_FOUND -> ModelAndView("/", HttpStatus.TEMPORARY_REDIRECT)
else -> ModelAndView("/error", status)
}
}