Repository: wicket Updated Branches: refs/heads/master bf662852e -> b78aedb09
WICKET-5793 Request for static resource creating a session in 6.13.0+ Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/b78aedb0 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/b78aedb0 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/b78aedb0 Branch: refs/heads/master Commit: b78aedb09bce8e10d0970aa1746cc1d9da1e5878 Parents: bf66285 Author: Andrea Del Bene <[email protected]> Authored: Wed Jan 14 22:35:13 2015 +0100 Committer: Andrea Del Bene <[email protected]> Committed: Wed Jan 14 22:35:13 2015 +0100 ---------------------------------------------------------------------- .../wicket/request/resource/PackageResource.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/b78aedb0/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 7f5251e..8c5b457 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 @@ -185,12 +185,22 @@ public class PackageResource extends AbstractResource implements IStaticCacheabl private Locale getCurrentLocale() { - return locale != null ? locale : Session.get().getLocale(); + if (locale == null && Session.exists()) + { + return Session.get().getLocale(); + } + + return locale; } private String getCurrentStyle() { - return style != null ? style : Session.get().getStyle(); + if (style == null && Session.exists()) + { + return Session.get().getStyle(); + } + + return style; } @Override
