Index: /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/handlers/LocalizedMessages.java
===================================================================
--- /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/handlers/LocalizedMessages.java	(revision 3477)
+++ /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/handlers/LocalizedMessages.java	(revision 3478)
@@ -116,4 +116,5 @@
 			locale = NEUTRAL;
 
+		// TODO synchronize from here
 		LocalizedMessages lp = prototypes.get(locale);
 		if (lp == null) {
@@ -121,4 +122,5 @@
 			prototypes.put(locale, lp);
 		}
+		// to here
 
 		// for now we don't need any cloning since the values are accessed
@@ -134,5 +136,6 @@
 	 * @return the locale resolver instance
 	 */
-	private static LocaleResolver getLocaleResolverInstance() {
+	// TODO synchronize this method
+	private synchronized static LocaleResolver getLocaleResolverInstance() {
 
 		if (localeResolver == null) {
@@ -158,5 +161,5 @@
 	 * Loads the localized messages for the given locale. This constructor loads
 	 * the resource bundle for this locale and only for this, in other words it
-	 * shortcircuits the default resource bundle load mechanism in order to
+	 * short-circuits the default resource bundle load mechanism in order to
 	 * prevent the loading of the system default locale which may result in a
 	 * completely different resource bundle.