Updated Branches: refs/heads/wicket-1.5.x cfe1f842c -> 2b6fb6b86
WICKET-4346 getAjaxRegionMarkupId called for not enabled behaviors Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/2b6fb6b8 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/2b6fb6b8 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/2b6fb6b8 Branch: refs/heads/wicket-1.5.x Commit: 2b6fb6b864df5c1c69e65a0c192a31df8f81fda4 Parents: cfe1f84 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Wed Jan 18 22:17:27 2012 +0100 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Wed Jan 18 22:26:25 2012 +0100 ---------------------------------------------------------------------- .../src/main/java/org/apache/wicket/Component.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/2b6fb6b8/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 30a2893..21ade17 100644 --- a/wicket-core/src/main/java/org/apache/wicket/Component.java +++ b/wicket-core/src/main/java/org/apache/wicket/Component.java @@ -2453,7 +2453,7 @@ public abstract class Component String markupId = null; for (Behavior behavior : getBehaviors()) { - if (behavior instanceof IAjaxRegionMarkupIdProvider) + if (behavior instanceof IAjaxRegionMarkupIdProvider && behavior.isEnabled(this)) { markupId = ((IAjaxRegionMarkupIdProvider)behavior).getAjaxRegionMarkupId(this); break;
