Repository: wicket Updated Branches: refs/heads/wicket-6.x e7ab4a70e -> fd3de0085
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/fd3de008 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/fd3de008 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/fd3de008 Branch: refs/heads/wicket-6.x Commit: fd3de0085e1f9f0dc98dbf456106d38a4b779f9e Parents: e7ab4a7 Author: Sven Meier <[email protected]> Authored: Mon Nov 24 21:07:13 2014 +0100 Committer: Sven Meier <[email protected]> Committed: Mon Nov 24 21:07:13 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/fd3de008/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;
