Make ObjectUtils.addObjectToArray() generic

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3951 50f2f4bb-b051-0410-bef5-90022cba6387
This commit is contained in:
Chris Beams
2011-02-08 13:01:29 +00:00
parent 91ecefdaa1
commit 6a68b44ca9
4 changed files with 16 additions and 15 deletions
@@ -334,12 +334,12 @@ public class ScriptFactoryPostProcessor extends InstantiationAwareBeanPostProces
ScriptFactory scriptFactory = this.scriptBeanFactory.getBean(scriptFactoryBeanName, ScriptFactory.class);
ScriptSource scriptSource =
getScriptSource(scriptFactoryBeanName, scriptFactory.getScriptSourceLocator());
Class[] interfaces = scriptFactory.getScriptInterfaces();
Class<?>[] interfaces = scriptFactory.getScriptInterfaces();
Class[] scriptedInterfaces = interfaces;
Class<?>[] scriptedInterfaces = interfaces;
if (scriptFactory.requiresConfigInterface() && !bd.getPropertyValues().isEmpty()) {
Class configInterface = createConfigInterface(bd, interfaces);
scriptedInterfaces = (Class[]) ObjectUtils.addObjectToArray(interfaces, configInterface);
Class<?> configInterface = createConfigInterface(bd, interfaces);
scriptedInterfaces = ObjectUtils.addObjectToArray(interfaces, configInterface);
}
BeanDefinition objectBd = createScriptedObjectBeanDefinition(