Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Restored isTypeMatch null behavior and refined typeToMatch parameter name

Browse Source 
Issue: SPR-12147
This commit is contained in:
Juergen Hoeller
2015-03-23 21:57:03 +01:00
parent 44e8f7b333
commit b2308926bc
8 changed files with 63 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spring-test/src/main/java/org/springframework/test/web/servlet/setup/StubWebApplicationContext.java
View File

@@ -86,6 +86,7 @@ class StubWebApplicationContext implements WebApplicationContext {
this.resourcePatternResolver = new ServletContextResourcePatternResolver(servletContext);
}
/**
* Returns an instance that can initialize {@link ApplicationContextAware} beans.
*/
@@ -194,13 +195,13 @@ class StubWebApplicationContext implements WebApplicationContext {
}
@Override
public boolean isTypeMatch(String name, ResolvableType targetType) throws NoSuchBeanDefinitionException {
return this.beanFactory.isTypeMatch(name, targetType);
public boolean isTypeMatch(String name, ResolvableType typeToMatch) throws NoSuchBeanDefinitionException {
return this.beanFactory.isTypeMatch(name, typeToMatch);
}
@Override
public boolean isTypeMatch(String name, Class<?> targetType) throws NoSuchBeanDefinitionException {
return this.beanFactory.isTypeMatch(name, targetType);
public boolean isTypeMatch(String name, Class<?> typeToMatch) throws NoSuchBeanDefinitionException {
return this.beanFactory.isTypeMatch(name, typeToMatch);
}
@Override