Updated Branches: refs/heads/wicket-1.5.x e946b32cd -> 3783e6ecb
WICKET-4430: By using int as the scope, it is possible to read arbitrary resources from the classpath of a wicket application Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/3783e6ec Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/3783e6ec Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/3783e6ec Branch: refs/heads/wicket-1.5.x Commit: 3783e6ecb4dc94603896bf1ecd3e69b06370ce67 Parents: e946b32 Author: Peter Ertl <[email protected]> Authored: Sat Feb 25 01:37:25 2012 +0100 Committer: Peter Ertl <[email protected]> Committed: Sat Feb 25 01:37:25 2012 +0100 ---------------------------------------------------------------------- .../mapper/BasicResourceReferenceMapper.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/3783e6ec/wicket-core/src/main/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapper.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapper.java b/wicket-core/src/main/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapper.java index 214f839..09b22d2 100755 --- a/wicket-core/src/main/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapper.java +++ b/wicket-core/src/main/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapper.java @@ -118,7 +118,8 @@ class BasicResourceReferenceMapper extends AbstractResourceReferenceMapper ResourceReference.UrlAttributes attributes = getResourceReferenceAttributes(url); Class<?> scope = resolveClass(className); - if (scope != null) + + if (scope != null && scope.getPackage() != null) { ResourceReference res = getContext().getResourceReferenceRegistry() .getResourceReference(scope, name.toString(), attributes.getLocale(),
