[freenet-cvs] r13703 - trunk/freenet/src/freenet/l10n

[t...@freenetproject.org]

Author: toad
Date: 2007-06-21 23:08:00 +0000 (Thu, 21 Jun 2007)
New Revision: 13703

Modified:
   trunk/freenet/src/freenet/l10n/L10n.java
Log:
Maybe fix NPE

Modified: trunk/freenet/src/freenet/l10n/L10n.java
===================================================================
--- trunk/freenet/src/freenet/l10n/L10n.java    2007-06-21 22:44:55 UTC (rev 
13702)
+++ trunk/freenet/src/freenet/l10n/L10n.java    2007-06-21 23:08:00 UTC (rev 
13703)
@@ -224,7 +224,7 @@
                if(result != null)
                        return result;
                else {
-                       Logger.normal(CLASS_NAME, "The translation for " + key 
+ " hasn't been found ("+currentClass.selectedLanguage+")! please tell the 
maintainer.");
+                       Logger.normal(CLASS_NAME, "The translation for " + key 
+ " hasn't been found ("+getSelectedLanguage()+")! please tell the 
maintainer.");
                        return (returnNullIfNotFound ? null : 
getDefaultString(key));
                }
        }
@@ -317,6 +317,7 @@
        */
        public static String getSelectedLanguage() {
                synchronized (sync) {
+                       if(currentClass == null) return null;
                        return currentClass.selectedLanguage;   
                }
        }