Repository: tapestry-5 Updated Branches: refs/heads/master 5db1364e9 -> 22edd355c
Shot-in-the-dark attempt to fix TAP5-1493 in Jenkins. Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/22edd355 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/22edd355 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/22edd355 Branch: refs/heads/master Commit: 22edd355cbea3894d5fee2eb8c38be1b6d5fd6ae Parents: 5db1364 Author: Thiago H. de Paula Figueiredo <thiag...@apache.org> Authored: Fri Jun 27 10:33:27 2014 -0300 Committer: Thiago H. de Paula Figueiredo <thiag...@apache.org> Committed: Fri Jun 27 10:33:27 2014 -0300 ---------------------------------------------------------------------- .../ioc/internal/services/ClassPropertyAdapterImpl.java | 10 ++++++++++ 1 file changed, 10 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/22edd355/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassPropertyAdapterImpl.java ---------------------------------------------------------------------- diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassPropertyAdapterImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassPropertyAdapterImpl.java index 9e032e6..c5679b2 100644 --- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassPropertyAdapterImpl.java +++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassPropertyAdapterImpl.java @@ -47,6 +47,16 @@ public class ClassPropertyAdapterImpl implements ClassPropertyAdapter continue; Method readMethod = pd.getReadMethod(); + + // TAP5-1493 + if (readMethod.isBridge()) { + for (Method m : beanType.getMethods()) { + if (readMethod.getName().equals(m.getName()) && !m.isBridge()) { + readMethod = m; + break; + } + } + } Class propertyType = readMethod == null ? pd.getPropertyType() : GenericsUtils.extractGenericReturnType( beanType, readMethod);