[wicket] branch wicket-7.x updated: WICKET-6631 corrected cache key

[svenmeier]

This is an automated email from the ASF dual-hosted git repository.

svenmeier pushed a commit to branch wicket-7.x
in repository https://gitbox.apache.org/repos/asf/wicket.git


The following commit(s) were added to refs/heads/wicket-7.x by this push:
     new 15eba07  WICKET-6631 corrected cache key
15eba07 is described below

commit 15eba0723ce6ac85cf98ea99bcada4940d6488b2
Author: Sven Meier <svenme...@apache.org>
AuthorDate: Wed Jan 16 15:51:03 2019 +0100

    WICKET-6631 corrected cache key
---
 .../injection/annot/AnnotProxyFieldValueFactory.java       | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git 
a/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java
 
b/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java
index 2054121..937a49e 100644
--- 
a/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java
+++ 
b/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java
@@ -190,19 +190,15 @@ public class AnnotProxyFieldValueFactory implements 
IFieldValueFactory
                if (Strings.isEmpty(name))
                {
                        Class<?> fieldType = field.getType();
-                       SimpleEntry<Class<?>, Class<?>> keyPair =
-                               new SimpleEntry<Class<?>, Class<?>>(fieldType, 
generic);
-
-                       name = beanNameCache.get(fieldType);
+                       
+                       SimpleEntry<Class<?>, Class<?>> key = new 
SimpleEntry<Class<?>, Class<?>>(fieldType, generic);
+                       name = beanNameCache.get(key);
                        if (name == null)
                        {
-                               name = 
getBeanNameOfClass(contextLocator.getSpringContext(), fieldType, 
-                                       generic, field.getName());
-
+                               name = 
getBeanNameOfClass(contextLocator.getSpringContext(), fieldType, generic, 
field.getName());
                                if (name != null)
                                {
-                                       
-                                       String tmpName = 
beanNameCache.putIfAbsent(keyPair, name);
+                                       String tmpName = 
beanNameCache.putIfAbsent(key, name);
                                        if (tmpName != null)
                                        {
                                                name = tmpName;