You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by ad...@apache.org on 2015/05/12 17:45:05 UTC
wicket git commit: WICKET-5898 reverted change that doesn not fix
problem
Repository: wicket
Updated Branches:
refs/heads/master c5a445504 -> 8417af664
WICKET-5898 reverted change that doesn not fix problem
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/8417af66
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/8417af66
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/8417af66
Branch: refs/heads/master
Commit: 8417af66413c4264a490e69cc20fbc811e861905
Parents: c5a4455
Author: Andrea Del Bene <“adelbene@apache.org”>
Authored: Tue May 12 17:44:29 2015 +0200
Committer: Andrea Del Bene <“adelbene@apache.org”>
Committed: Tue May 12 17:44:29 2015 +0200
----------------------------------------------------------------------
.../markup/html/panel/DefaultMarkupSourcingStrategy.java | 6 +-----
.../apache/wicket/core/request/mapper/MountedMapperTest.java | 3 ++-
.../wicket/markup/html/TransparentWebMarkupContainerTest.java | 1 +
3 files changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/8417af66/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/DefaultMarkupSourcingStrategy.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/DefaultMarkupSourcingStrategy.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/DefaultMarkupSourcingStrategy.java
index f1749af..6699a68 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/DefaultMarkupSourcingStrategy.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/DefaultMarkupSourcingStrategy.java
@@ -21,7 +21,6 @@ import org.apache.wicket.MarkupContainer;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.IMarkupFragment;
import org.apache.wicket.markup.MarkupStream;
-import org.apache.wicket.markup.resolver.IComponentResolver;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -97,10 +96,7 @@ public final class DefaultMarkupSourcingStrategy extends AbstractMarkupSourcingS
return markup;
}
- if(!(child instanceof IComponentResolver))
- {
- markup = searchMarkupInTransparentResolvers(container, child);
- }
+ markup = searchMarkupInTransparentResolvers(container, child);
return markup;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/8417af66/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/MountedMapperTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/MountedMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/MountedMapperTest.java
index e3df7c5..2ad6033 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/MountedMapperTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/MountedMapperTest.java
@@ -914,7 +914,8 @@ public class MountedMapperTest extends AbstractMapperTest
final int requiredParamScore = requiredParam.getCompatibilityScore(request);
final int optCompatScore = optionalParameter.getCompatibilityScore(request);
final int requiredOptCompatScore = requiredOptionalParam.getCompatibilityScore(request);
-
+
+ //all the mappers above must be eligible for the give URL (i.e. their score must be > 0)
assertTrue("exactMount mapper must be eligible to handle the request", exactCompatScore > 0);
assertTrue("requiredParam mapper must be eligible to handle the request", requiredParamScore > 0);
assertTrue("optionalParameter mapper must be eligible to handle the request", optCompatScore > 0);
http://git-wip-us.apache.org/repos/asf/wicket/blob/8417af66/wicket-core/src/test/java/org/apache/wicket/markup/html/TransparentWebMarkupContainerTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/TransparentWebMarkupContainerTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/TransparentWebMarkupContainerTest.java
index 19db265..5cc8e46 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/TransparentWebMarkupContainerTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/TransparentWebMarkupContainerTest.java
@@ -177,6 +177,7 @@ public class TransparentWebMarkupContainerTest extends WicketTestCase
* container and trying to update a label that was added to the outer TWMC.
*/
@Test
+ @Ignore("Fails due to WICKET-5898")
public void ajaxRequestForComponentInTransparentWebMarkupContainerShouldntCauseStackOverflow3()
{
tester.startPage(DoubleNestedTransparentContainerWithSiblingTransparentContainerPage.class);