tapestry-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thiag...@apache.org
Subject git commit: Fix an NPE I've introduced while investigating TAP5-1493.
Date Fri, 27 Jun 2014 14:17:36 GMT
Repository: tapestry-5
Updated Branches:
  refs/heads/master 22edd355c -> fd2714cce


Fix an NPE I've introduced while investigating TAP5-1493.

Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/fd2714cc
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/fd2714cc
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/fd2714cc

Branch: refs/heads/master
Commit: fd2714ccea5c9b51e7f33313d92a1608d0d9a4e1
Parents: 22edd35
Author: Thiago H. de Paula Figueiredo <thiagohp@apache.org>
Authored: Fri Jun 27 11:15:57 2014 -0300
Committer: Thiago H. de Paula Figueiredo <thiagohp@apache.org>
Committed: Fri Jun 27 11:15:57 2014 -0300

----------------------------------------------------------------------
 .../tapestry5/ioc/internal/services/ClassPropertyAdapterImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/fd2714cc/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 c5679b2..53775a8 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
@@ -49,7 +49,7 @@ public class ClassPropertyAdapterImpl implements ClassPropertyAdapter
             Method readMethod = pd.getReadMethod();
             
             // TAP5-1493
-            if (readMethod.isBridge()) {
+            if (readMethod != null && readMethod.isBridge()) {
                 for (Method m : beanType.getMethods()) {
                     if (readMethod.getName().equals(m.getName()) && !m.isBridge())
{
                         readMethod = m;


Mime
View raw message