[freenet-cvs] r21262 - in trunk/freenet/src/freenet: config l10n

[nextg...@freenetproject.org]

Author: nextgens
Date: 2008-07-19 18:00:01 +0000 (Sat, 19 Jul 2008)
New Revision: 21262

Modified:
   trunk/freenet/src/freenet/config/StringOption.java
   trunk/freenet/src/freenet/l10n/L10n.java
Log:
silent two startup-related NPE

Modified: trunk/freenet/src/freenet/config/StringOption.java
===================================================================
--- trunk/freenet/src/freenet/config/StringOption.java  2008-07-19 17:54:53 UTC 
(rev 21261)
+++ trunk/freenet/src/freenet/config/StringOption.java  2008-07-19 18:00:01 UTC 
(rev 21262)
@@ -42,7 +42,7 @@

        public boolean isDefault() {
                getValue();
-               return currentValue.equals(defaultValue);
+               return (currentValue == null ? false : 
currentValue.equals(defaultValue));
        }

        public void setDefault() {

Modified: trunk/freenet/src/freenet/l10n/L10n.java
===================================================================
--- trunk/freenet/src/freenet/l10n/L10n.java    2008-07-19 17:54:53 UTC (rev 
21261)
+++ trunk/freenet/src/freenet/l10n/L10n.java    2008-07-19 18:00:01 UTC (rev 
21262)
@@ -313,8 +313,10 @@
        */
        public static String getSelectedLanguage() {
                synchronized (sync) {
-                       if(currentClass == null) return FALLBACK_DEFAULT;
-                       return currentClass.selectedLanguage;   
+                       if((currentClass == null) || 
(currentClass.selectedLanguage == null))
+                               return FALLBACK_DEFAULT;
+                       else
+                               return currentClass.selectedLanguage;   
                }
        }