[Aplaws-commit] r1158 - trunk/ccm-cms/src/com/arsdigita/cms/dispatcher

[<ap...@vh...>]

Author: apevec
Date: 2006-06-13 18:42:30 +0200 (Tue, 13 Jun 2006)
New Revision: 1158

Modified:
   trunk/ccm-cms/src/com/arsdigita/cms/dispatcher/MultilingualItemResolver.java
Log:
w/o web context fallback to the primary language instance


Modified: trunk/ccm-cms/src/com/arsdigita/cms/dispatcher/MultilingualItemResolver.java
===================================================================
--- trunk/ccm-cms/src/com/arsdigita/cms/dispatcher/MultilingualItemResolver.java	2006-06-12 08:49:35 UTC (rev 1157)
+++ trunk/ccm-cms/src/com/arsdigita/cms/dispatcher/MultilingualItemResolver.java	2006-06-13 16:42:30 UTC (rev 1158)
@@ -877,10 +877,15 @@
 		// TODO: do something about this UCI (Unknown Content Item)...
 
 		// XXX sketchy getRequest
-		final ContentItem resolved =
-		    ((ContentBundle) item).negotiate
-		    (Web.getRequest().getLocales());
-
+        HttpServletRequest req = Web.getRequest();
+        final ContentItem resolved;
+        if (req != null) {
+            resolved = ((ContentBundle) item)
+                .negotiate(req.getLocales());
+        } else {
+            // fallback to the primary instance when request is not available
+            resolved = ((ContentBundle) item).getPrimaryInstance();
+        }
 		if (s_log.isDebugEnabled()) {
 		    s_log.debug("Resolved URL to item " + resolved);
 		}