From 2bae0613a35251c03d56204a2927d200abf9a9ef Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Tue, 5 Jul 2016 18:49:43 +0200 Subject: [PATCH] Ensure code compiles with Eclipse JDT --- .../beans/factory/config/YamlMapFactoryBean.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/YamlMapFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/YamlMapFactoryBean.java index 89c2a9d216..f928c241ef 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/YamlMapFactoryBean.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/YamlMapFactoryBean.java @@ -129,7 +129,8 @@ public class YamlMapFactoryBean extends YamlProcessor implements FactoryBean result = new LinkedHashMap<>((Map) existing); + // Inner cast required by Eclipse IDE. + Map result = new LinkedHashMap<>((Map) existing); merge(result, (Map) value); output.put(key, result); } -- GitLab