You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by jd...@apache.org on 2009/02/18 19:41:11 UTC
svn commit: r745601 -
/wicket/trunk/wicket/src/main/java/org/apache/wicket/Localizer.java
Author: jdonnerstag
Date: Wed Feb 18 18:41:11 2009
New Revision: 745601
URL: http://svn.apache.org/viewvc?rev=745601&view=rev
Log:
additional fix for wicket-2102: Localizer never caches resources when component is not given
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/Localizer.java
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/Localizer.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/Localizer.java?rev=745601&r1=745600&r2=745601&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/Localizer.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/Localizer.java Wed Feb 18 18:41:11 2009
@@ -28,6 +28,7 @@
import org.apache.wicket.model.IModel;
import org.apache.wicket.resource.loader.IStringResourceLoader;
import org.apache.wicket.settings.IResourceSettings;
+import org.apache.wicket.util.lang.Generics;
import org.apache.wicket.util.string.AppendingStringBuffer;
import org.apache.wicket.util.string.interpolator.PropertyVariableInterpolator;
import org.slf4j.Logger;
@@ -440,6 +441,11 @@
// buffer.append("-").append(component.getVariation());
cacheKey = buffer.toString();
}
+ else
+ {
+ cacheKey += "-" + Session.get().getLocale().toString();
+ }
+
return cacheKey;
}
@@ -503,7 +509,7 @@
*/
private static class ClassMetaDatabase
{
- private final ConcurrentMap<String, Long> nameToId = new ConcurrentHashMap<String, Long>();
+ private final ConcurrentMap<String, Long> nameToId = Generics.newConcurrentHashMap();
private final AtomicLong nameCounter = new AtomicLong();
/**
@@ -529,6 +535,4 @@
return id;
}
}
-
-
}
\ No newline at end of file