[Bedework-commit] calendarapi r805 - trunk/calsvc/src/org/bedework/calsvc

[svnadmin at bedework.org]

Author: douglm
Date: 2009-02-09 22:59:47 -0500 (Mon, 09 Feb 2009)
New Revision: 805

Modified:
   trunk/calsvc/src/org/bedework/calsvc/Preferences.java
Log:
No ACCEPT-LANGUAGE header causes exception.

Modified: trunk/calsvc/src/org/bedework/calsvc/Preferences.java
===================================================================
--- trunk/calsvc/src/org/bedework/calsvc/Preferences.java	2009-02-10 03:23:14 UTC (rev 804)
+++ trunk/calsvc/src/org/bedework/calsvc/Preferences.java	2009-02-10 03:59:47 UTC (rev 805)
@@ -317,13 +317,17 @@
 
     /* See if the supplied list has a match in the supported locales */
 
-    for (Locale l: locales) {
-      l = BwLocale.matchLocales(sysLocales, l);
-      if (l != null) {
-        if (debug) {
-          trace("Setting locale to " + l);
+    if (locales != null) {
+      // We had an ACCEPT-LANGUAGE header
+
+      for (Locale l: locales) {
+        l = BwLocale.matchLocales(sysLocales, l);
+        if (l != null) {
+          if (debug) {
+            trace("Setting locale to " + l);
+          }
+          return l;
         }
-        return l;
       }
     }