Repository: wicket
Updated Branches:
  refs/heads/master 83454e72d -> bd577a413


WICKET-5834: return null, no model means no property


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

Branch: refs/heads/master
Commit: bd577a413cfcec88eb05c7e3917b5781c168bae6
Parents: 83454e7
Author: Emond Papegaaij <emond.papega...@topicus.nl>
Authored: Tue Feb 10 11:48:53 2015 +0100
Committer: Emond Papegaaij <emond.papega...@topicus.nl>
Committed: Tue Feb 10 11:49:38 2015 +0100

----------------------------------------------------------------------
 .../apache/wicket/bean/validation/DefaultPropertyResolver.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/bd577a41/wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/DefaultPropertyResolver.java
----------------------------------------------------------------------
diff --git 
a/wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/DefaultPropertyResolver.java
 
b/wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/DefaultPropertyResolver.java
index ab8a11a..527a24f 100644
--- 
a/wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/DefaultPropertyResolver.java
+++ 
b/wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/DefaultPropertyResolver.java
@@ -22,7 +22,11 @@ public class DefaultPropertyResolver implements 
IPropertyResolver
        public Property resolveProperty(FormComponent<?> component)
        {
                IPropertyReflectionAwareModel<?> delegate = 
ValidationModelResolver.resolvePropertyModelFrom(component);
-
+               if (delegate == null)
+               {
+                       return null;
+               }
+               
                String name;
                Method getter = delegate.getPropertyGetter();
                if (getter != null)

Reply via email to