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

Make ObjectUtils.addObjectToArray() generic

Browse Source
This commit is contained in:
Chris Beams
2011-02-08 13:01:29 +00:00
parent fb57316afa
commit b04987ccc3
4 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
org.springframework.context/src/main/java/org/springframework/scripting/support/ScriptFactoryPostProcessor.java
View File

@@ -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(