Merge branch '6.3.x'
This commit is contained in:
commit
db04b5a248
|
@ -509,7 +509,8 @@ public abstract class AbstractRequestMatcherRegistry<C> {
|
||||||
public boolean matches(HttpServletRequest request) {
|
public boolean matches(HttpServletRequest request) {
|
||||||
String name = request.getHttpServletMapping().getServletName();
|
String name = request.getHttpServletMapping().getServletName();
|
||||||
ServletRegistration registration = this.servletContext.getServletRegistration(name);
|
ServletRegistration registration = this.servletContext.getServletRegistration(name);
|
||||||
Assert.notNull(registration, computeErrorMessage(this.servletContext.getServletRegistrations().values()));
|
Assert.notNull(registration,
|
||||||
|
() -> computeErrorMessage(this.servletContext.getServletRegistrations().values()));
|
||||||
try {
|
try {
|
||||||
Class<?> clazz = Class.forName(registration.getClassName());
|
Class<?> clazz = Class.forName(registration.getClassName());
|
||||||
return DispatcherServlet.class.isAssignableFrom(clazz);
|
return DispatcherServlet.class.isAssignableFrom(clazz);
|
||||||
|
|
Loading…
Reference in New Issue