| commit | b52cc9ee555a02043f15603821c40da36cd034db | [log] [tgz] |
|---|---|---|
| author | Igor Vaynberg <ivaynberg@apache.org> | Fri Jun 20 16:30:02 2008 +0000 |
| committer | Igor Vaynberg <ivaynberg@apache.org> | Fri Jun 20 16:30:02 2008 +0000 |
| tree | 1976b52f738f4fc4a8aa450744c54ee683b6f12c | |
| parent | 6d507b1d1c94b1564ff3ebb89d9c25f13fdf7010 [diff] |
WICKET-1711 git-svn-id: https://svn.apache.org/repos/asf/wicket/branches/wicket-1.3.x@669976 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/jdk-1.4/wicket/src/main/java/org/apache/wicket/resource/loader/BundleStringResourceLoader.java b/jdk-1.4/wicket/src/main/java/org/apache/wicket/resource/loader/BundleStringResourceLoader.java index 477aa0e..e52fa98 100644 --- a/jdk-1.4/wicket/src/main/java/org/apache/wicket/resource/loader/BundleStringResourceLoader.java +++ b/jdk-1.4/wicket/src/main/java/org/apache/wicket/resource/loader/BundleStringResourceLoader.java
@@ -67,11 +67,7 @@ { if (locale == null) { - locale = Session.get().getLocale(); - if (locale == null) - { - locale = Locale.getDefault(); - } + locale = (Session.exists()) ? Session.get().getLocale() : Locale.getDefault(); } try {