Updated Branches:
  refs/heads/wicket-1.5.x b6c203d5d -> 645a8e223

first set all the values before trying to accept it (accept needs them)
still not a a perfect solution because there are some protected/public
methods called through accept() now

Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/645a8e22
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/645a8e22
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/645a8e22

Branch: refs/heads/wicket-1.5.x
Commit: 645a8e22303bbf2541454ff5d108afd2c71bb7fe
Parents: b6c203d
Author: Johan Compagner <[email protected]>
Authored: Sun Feb 26 13:33:25 2012 +0100
Committer: Johan Compagner <[email protected]>
Committed: Sun Feb 26 13:33:25 2012 +0100

----------------------------------------------------------------------
 .../wicket/request/resource/PackageResource.java   |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/645a8e22/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResource.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResource.java
 
b/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResource.java
index 50cb7aa..398336a 100644
--- 
a/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResource.java
+++ 
b/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResource.java
@@ -150,17 +150,16 @@ public class PackageResource extends AbstractResource 
implements IStaticCacheabl
                        path = name;
                }
 
+               scopeName = scope.getName();
+               this.locale = locale;
+               this.style = style;
+               this.variation = variation;
                if (!accept(scope, path))
                {
                        throw new PackageResourceBlockedException(
                                "Access denied to (static) package resource " + 
absolutePath +
                                        ". See IPackageResourceGuard");
                }
-
-               scopeName = scope.getName();
-               this.locale = locale;
-               this.style = style;
-               this.variation = variation;
        }
 
        private Locale getCurrentLocale()

Reply via email to