You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2016/04/24 21:57:30 UTC

[06/10] wicket git commit: check mapper result in #flatMap in get- and setObject

check mapper result in #flatMap in get- and setObject


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

Branch: refs/heads/master
Commit: a68dc57a801628c455d0aa4efc61a0b474f3bdf2
Parents: 3719da9
Author: Matthias Metzger <no...@yahoo.de>
Authored: Sun Apr 24 21:22:35 2016 +0200
Committer: Matthias Metzger <no...@yahoo.de>
Committed: Sun Apr 24 21:22:35 2016 +0200

----------------------------------------------------------------------
 .../main/java/org/apache/wicket/model/IModel.java   | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/a68dc57a/wicket-core/src/main/java/org/apache/wicket/model/IModel.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/model/IModel.java b/wicket-core/src/main/java/org/apache/wicket/model/IModel.java
index a85365c..8f86030 100644
--- a/wicket-core/src/main/java/org/apache/wicket/model/IModel.java
+++ b/wicket-core/src/main/java/org/apache/wicket/model/IModel.java
@@ -185,7 +185,15 @@ public interface IModel<T> extends IDetachable
 				T object = IModel.this.getObject();
 				if (object != null)
 				{
-					return mapper.apply(object).getObject();
+					IModel<R> model = mapper.apply(object);
+					if (model != null) 
+					{
+						return model.getObject();
+					}
+					else 
+					{
+						return null;
+					}
 				}
 				else
 				{
@@ -199,7 +207,11 @@ public interface IModel<T> extends IDetachable
 				T modelObject = IModel.this.getObject();
 				if (modelObject != null)
 				{
-					mapper.apply(modelObject).setObject(object);
+					IModel<R> model = mapper.apply(modelObject);
+					if (model != null)
+					{
+						model.setObject(object);
+					}
 				}
 			}