Merge branch '1.5.x' into 2.0.x
This commit is contained in:
commit
44632ea55c
|
|
@ -570,18 +570,4 @@ public class ServletWebServerApplicationContextTests {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
protected static class WithAutowiredServletContext {
|
|
||||||
|
|
||||||
private final ServletContext context;
|
|
||||||
|
|
||||||
public WithAutowiredServletContext(ServletContext context) {
|
|
||||||
this.context = context;
|
|
||||||
}
|
|
||||||
|
|
||||||
public ServletContext getContext() {
|
|
||||||
return this.context;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue