You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by th...@apache.org on 2014/05/24 21:18:41 UTC
[4/4] git commit: Fixes an NPE in PropertyModelImpl
Fixes an NPE in PropertyModelImpl
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/7485d916
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/7485d916
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/7485d916
Branch: refs/heads/5.3
Commit: 7485d91671ff33cb2f45cfc7aa69822fccc9426a
Parents: 2dbf880
Author: Thiago H. de Paula Figueiredo <th...@arsmachina.com.br>
Authored: Sat May 24 16:17:17 2014 -0300
Committer: Thiago H. de Paula Figueiredo <th...@arsmachina.com.br>
Committed: Sat May 24 16:17:17 2014 -0300
----------------------------------------------------------------------
.../apache/tapestry5/internal/beaneditor/PropertyModelImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/7485d916/tapestry-core/src/main/java/org/apache/tapestry5/internal/beaneditor/PropertyModelImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/beaneditor/PropertyModelImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/beaneditor/PropertyModelImpl.java
index 3edfaff..0cd041c 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/beaneditor/PropertyModelImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/beaneditor/PropertyModelImpl.java
@@ -53,7 +53,7 @@ public class PropertyModelImpl implements PropertyModel
label = TapestryInternalUtils.defaultLabel(id, messages, name);
// TAP5-2305
- Sortable sortableAnnotation = conduit.getAnnotation(Sortable.class);
+ Sortable sortableAnnotation = conduit != null ? conduit.getAnnotation(Sortable.class) : null;
if (sortableAnnotation != null)
{
sortable = sortableAnnotation.value();