From 05a16a1bfab15215f0b9a71f383cfe99b15f322b Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@pivotal.io>
Date: Fri, 21 Aug 2015 16:55:04 +0200
Subject: [PATCH] Avoid ambiguous property warning for methods with multiple
 parameters

Issue: SPR-13349
---
 .../beans/GenericTypeAwarePropertyDescriptor.java            | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/spring-beans/src/main/java/org/springframework/beans/GenericTypeAwarePropertyDescriptor.java b/spring-beans/src/main/java/org/springframework/beans/GenericTypeAwarePropertyDescriptor.java
index c3005d0885..ffe31bd854 100644
--- a/spring-beans/src/main/java/org/springframework/beans/GenericTypeAwarePropertyDescriptor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/GenericTypeAwarePropertyDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -90,7 +90,8 @@ final class GenericTypeAwarePropertyDescriptor extends PropertyDescriptor {
 				Set<Method> ambiguousCandidates = new HashSet<Method>();
 				for (Method method : beanClass.getMethods()) {
 					if (method.getName().equals(writeMethodToUse.getName()) &&
-							!method.equals(writeMethodToUse) && !method.isBridge()) {
+							!method.equals(writeMethodToUse) && !method.isBridge() &&
+							method.getParameterTypes().length == writeMethodToUse.getParameterTypes().length) {
 						ambiguousCandidates.add(method);
 					}
 				}