Updated Branches:
  refs/heads/master d74a22c38 -> 8a10d5d9a

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/8a10d5d9
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/8a10d5d9
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/8a10d5d9

Branch: refs/heads/master
Commit: 8a10d5d9a5098b7fdad08776cd30557a4544f6d3
Parents: d74a22c
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:17:27 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/8a10d5d9/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 7a546d1..26949bd 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Component.java
+++ b/wicket-core/src/main/java/org/apache/wicket/Component.java
@@ -2452,7 +2452,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;

Reply via email to