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 2013/05/15 10:29:35 UTC
git commit: WICKET-5163 Implementing markup loading by extending
ResourceStreamLocator produces errors with inherited markup
Updated Branches:
refs/heads/master 27ac13df1 -> 7eda0dd20
WICKET-5163 Implementing markup loading by extending ResourceStreamLocator produces errors with inherited markup
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/7eda0dd2
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/7eda0dd2
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/7eda0dd2
Branch: refs/heads/master
Commit: 7eda0dd200216bc9e595d55ea6f6eb7cbb68a30a
Parents: 27ac13d
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed May 15 11:29:06 2013 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed May 15 11:29:06 2013 +0300
----------------------------------------------------------------------
.../DefaultMarkupResourceStreamProvider.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/7eda0dd2/wicket-core/src/main/java/org/apache/wicket/markup/DefaultMarkupResourceStreamProvider.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/DefaultMarkupResourceStreamProvider.java b/wicket-core/src/main/java/org/apache/wicket/markup/DefaultMarkupResourceStreamProvider.java
index 2f8d2a7..42bf66c 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/DefaultMarkupResourceStreamProvider.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/DefaultMarkupResourceStreamProvider.java
@@ -84,7 +84,7 @@ public class DefaultMarkupResourceStreamProvider implements IMarkupResourceStrea
while (containerClass != MarkupContainer.class)
{
String path = containerClass.getName().replace('.', '/');
- IResourceStream resourceStream = locator.locate(container.getClass(), path, style,
+ IResourceStream resourceStream = locator.locate(containerClass, path, style,
variation, locale, ext, false);
// Did we find it already?