You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by da...@apache.org on 2018/02/06 15:18:37 UTC
wicket git commit: Fixes when component added to ART is a Page
Repository: wicket
Updated Branches:
refs/heads/master 3be55cf5a -> 830fb15c3
Fixes when component added to ART is a Page
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/830fb15c
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/830fb15c
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/830fb15c
Branch: refs/heads/master
Commit: 830fb15c333ad6099f466b2344a84b513690db86
Parents: 3be55cf
Author: Martijn Dashorst <ma...@topicus.nl>
Authored: Tue Feb 6 16:18:28 2018 +0100
Committer: Martijn Dashorst <ma...@topicus.nl>
Committed: Tue Feb 6 16:18:28 2018 +0100
----------------------------------------------------------------------
.../java/org/apache/wicket/ajax/AjaxRequestHandler.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/830fb15c/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxRequestHandler.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxRequestHandler.java b/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxRequestHandler.java
index 2ad4162..63bca5f 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxRequestHandler.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxRequestHandler.java
@@ -233,8 +233,12 @@ public class AjaxRequestHandler implements AjaxRequestTarget
"Cannot update component that does not have setOutputMarkupId property set to true. Component: " +
component.toString());
}
- Page page = component.findParent(Page.class);
- if (page != getPage())
+ Page pageOfComponent = component.findParent(Page.class);
+ if (component == getPage() || pageOfComponent == getPage())
+ {
+ add(component, component.getMarkupId());
+ }
+ else
{
String msg = "Cannot update component because its page is not the same as " +
"the one this handler has been created for. Component: " + component.toString();
@@ -250,10 +254,6 @@ public class AjaxRequestHandler implements AjaxRequestTarget
log.error(msg, error);
}
}
- else
- {
- add(component, component.getMarkupId());
- }
}
}