You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by sv...@apache.org on 2014/11/24 17:08:36 UTC

wicket git commit: WICKET-5772 set attached after load, so failuer of load() will not keep null value

Repository: wicket
Updated Branches:
  refs/heads/master 88a071e43 -> 61d6264b2


WICKET-5772 set attached after load, so failuer of load() will not keep null value


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

Branch: refs/heads/master
Commit: 61d6264b2bfa1a68b18a1c223945ad1cd9a3b8de
Parents: 88a071e
Author: Sven Meier <sv...@apache.org>
Authored: Mon Nov 24 17:07:50 2014 +0100
Committer: Sven Meier <sv...@apache.org>
Committed: Mon Nov 24 17:07:50 2014 +0100

----------------------------------------------------------------------
 .../main/java/org/apache/wicket/model/LoadableDetachableModel.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/61d6264b/wicket-core/src/main/java/org/apache/wicket/model/LoadableDetachableModel.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/model/LoadableDetachableModel.java b/wicket-core/src/main/java/org/apache/wicket/model/LoadableDetachableModel.java
index 2a85694..c172678 100644
--- a/wicket-core/src/main/java/org/apache/wicket/model/LoadableDetachableModel.java
+++ b/wicket-core/src/main/java/org/apache/wicket/model/LoadableDetachableModel.java
@@ -117,7 +117,6 @@ public abstract class LoadableDetachableModel<T> implements IModel<T>
 	{
 		if (!attached)
 		{
-			attached = true;
 			transientModelObject = load();
 
 			if (log.isDebugEnabled())
@@ -126,6 +125,7 @@ public abstract class LoadableDetachableModel<T> implements IModel<T>
 					", requestCycle " + RequestCycle.get());
 			}
 
+			attached = true;
 			onAttach();
 		}
 		return transientModelObject;