Merge branch '1.5.x'

This commit is contained in:
Stephane Nicoll
2017-01-04 09:56:19 +01:00
11 changed files with 14 additions and 14 deletions

View File

@@ -71,7 +71,7 @@ public class ClassLoaderFilesResourcePatternResolverTests {
}
@Test
public void getResourceWhenHasServeletContextShouldReturnServletResource()
public void getResourceWhenHasServletContextShouldReturnServletResource()
throws Exception {
GenericWebApplicationContext context = new GenericWebApplicationContext(
new MockServletContext());