GrailsWebRequestFilter doesn't clearGrailsWebRequest when isIncludeOrForward && previous == null

[felixscheinost]

Expected Behavior

We are calling a Grails servlet from another servlet to handle some URLs in a backwards compatible way.

So basically we have:

object : HttpServlet() {
  override fun doGet(req: HttpServletRequest, resp: HttpServletResponse) {
    val dispatcher = grailsContext.servletContext.getRequestDispatcher(<some logic>)
    // Forward to some other path in Grails
    dispatcher.forward(req, resp)
  }
}

I agree this is probably a very uncommon usecase but for us it is the only way.

After dispatcher.forward(...) the RequestContextHolder should always be empty again, right?

Actual Behaviour

Actually, GrailsWebRequestFilter incorrectly doesn't reset RequetContextHolder if the request is an include or forward.

Why? I don't think there really is a reason, it is just a else that was never written.

The code currently is:

if(isIncludeOrForward) {
    if(previous != null) {
        WebUtils.storeGrailsWebRequest(previous);
    }
}
else {

    WebUtils.clearGrailsWebRequest();
    LocaleContextHolder.setLocale(null);
}

I think it should be:

  if (previous != null) {
     WebUtils.storeGrailsWebRequest(previous);
  } else {
      WebUtils.clearGrailsWebRequest();
 }

Reason: We must ALWAYS reset the world to how we found it before. So either reset the previous or clear it.

Steps To Reproduce

No response

Environment Information

No response

Example Application

No response

Version

Latest