File tree Expand file tree Collapse file tree 1 file changed +5
-1
lines changed
spring-web/src/main/java/org/springframework/web/util Expand file tree Collapse file tree 1 file changed +5
-1
lines changed Original file line number Diff line number Diff line change 21
21
import java .util .Map ;
22
22
import java .util .Properties ;
23
23
24
+ import javax .servlet .RequestDispatcher ;
24
25
import javax .servlet .ServletRequest ;
25
26
import javax .servlet .http .HttpServletMapping ;
26
27
import javax .servlet .http .HttpServletRequest ;
@@ -774,7 +775,10 @@ public String removeSemicolonContent(String requestUri) {
774
775
private static class Servlet4Delegate {
775
776
776
777
public static boolean skipServletPathDetermination (HttpServletRequest request ) {
777
- HttpServletMapping mapping = request .getHttpServletMapping ();
778
+ HttpServletMapping mapping = (HttpServletMapping ) request .getAttribute (RequestDispatcher .INCLUDE_MAPPING );
779
+ if (mapping == null ) {
780
+ mapping = request .getHttpServletMapping ();
781
+ }
778
782
MappingMatch match = mapping .getMappingMatch ();
779
783
return (match != null && (!match .equals (MappingMatch .PATH ) || mapping .getPattern ().equals ("/*" )));
780
784
}
You can’t perform that action at this time.
0 commit comments