Repository: wicket Updated Branches: refs/heads/wicket-6.x 8472b80e3 -> ae76a350f
Revert "WICKET-5772 set attached after load, so failuer of load() will not keep null value" This reverts commit fd3de0085e1f9f0dc98dbf456106d38a4b779f9e. Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/1c1c151d Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/1c1c151d Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/1c1c151d Branch: refs/heads/wicket-6.x Commit: 1c1c151da0636d4c433e198de97c84ca63f885a8 Parents: 8472b80 Author: Sven Meier <[email protected]> Authored: Wed Nov 26 13:45:11 2014 +0100 Committer: Sven Meier <[email protected]> Committed: Wed Nov 26 13:45:11 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/1c1c151d/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 c172678..2a85694 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,6 +117,7 @@ public abstract class LoadableDetachableModel<T> implements IModel<T> { if (!attached) { + attached = true; transientModelObject = load(); if (log.isDebugEnabled()) @@ -125,7 +126,6 @@ public abstract class LoadableDetachableModel<T> implements IModel<T> ", requestCycle " + RequestCycle.get()); } - attached = true; onAttach(); } return transientModelObject;
