Repository: wicket Updated Branches: refs/heads/wicket-6.x 602f36396 -> 160c0f643
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/160c0f64 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/160c0f64 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/160c0f64 Branch: refs/heads/wicket-6.x Commit: 160c0f64356da6f66cff33101fe59e2f7b355da3 Parents: 602f363 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:37:07 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/160c0f64/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 ae421b7..30ebfc4 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
