You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2008/06/20 18:30:03 UTC
svn commit: r669976 -
/wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/resource/loader/BundleStringResourceLoader.java
Author: ivaynberg
Date: Fri Jun 20 09:30:02 2008
New Revision: 669976
URL: http://svn.apache.org/viewvc?rev=669976&view=rev
Log:
WICKET-1711
Modified:
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/resource/loader/BundleStringResourceLoader.java
Modified: wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/resource/loader/BundleStringResourceLoader.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/resource/loader/BundleStringResourceLoader.java?rev=669976&r1=669975&r2=669976&view=diff
==============================================================================
--- wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/resource/loader/BundleStringResourceLoader.java (original)
+++ wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/resource/loader/BundleStringResourceLoader.java Fri Jun 20 09:30:02 2008
@@ -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
{