Map resolution for multiple beans applies to plain Map interface declaration only

Issue: SPR-15117
This commit is contained in:
Juergen Hoeller
2017-01-12 21:15:41 +01:00
parent 9e6aa0ff59
commit 8084da59a7
2 changed files with 146 additions and 4 deletions

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2016 the original author or authors.
* Copyright 2002-2017 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -1173,7 +1173,7 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
}
return result;
}
else if (Map.class.isAssignableFrom(type) && type.isInterface()) {
else if (Map.class == type) {
Class<?> keyType = descriptor.getMapKeyType();
if (String.class != keyType) {
return null;