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 2014/03/24 09:37:29 UTC
git commit: WICKET-5538 When using Component.setDefaultModel,
only detach the previous model if the new one is different
Repository: wicket
Updated Branches:
refs/heads/wicket-6.x 469f189c0 -> 6f791bd82
WICKET-5538 When using Component.setDefaultModel, only detach the previous model if the new one is different
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/6f791bd8
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/6f791bd8
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/6f791bd8
Branch: refs/heads/wicket-6.x
Commit: 6f791bd8298aab764774938e6b90f7bd1305830d
Parents: 469f189
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Mar 24 09:37:14 2014 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Mar 24 09:37:14 2014 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/wicket/Component.java | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/6f791bd8/wicket-core/src/main/java/org/apache/wicket/Component.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/Component.java b/wicket-core/src/main/java/org/apache/wicket/Component.java
index 8bfc9b4..ca0eeb5 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Component.java
+++ b/wicket-core/src/main/java/org/apache/wicket/Component.java
@@ -2966,11 +2966,6 @@ public abstract class Component
public Component setDefaultModel(final IModel<?> model)
{
IModel<?> prevModel = getModelImpl();
- // Detach current model
- if (prevModel != null)
- {
- prevModel.detach();
- }
IModel<?> wrappedModel = prevModel;
if (prevModel instanceof IWrapModel)
@@ -2981,6 +2976,12 @@ public abstract class Component
// Change model
if (wrappedModel != model)
{
+ // Detach the old/current model
+ if (prevModel != null)
+ {
+ prevModel.detach();
+ }
+
modelChanging();
setModelImpl(wrap(model));
modelChanged();