svn commit: r505668 - /struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesPlugin.java

[apetrelli]

Author: apetrelli
Date: Sat Feb 10 01:57:21 2007
New Revision: 505668

URL: http://svn.apache.org/viewvc?view=rev&rev=505668
Log:
Fixed key extraction in the case of no module selected.

Modified:
    
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesPlugin.java

Modified: 
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesPlugin.java
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesPlugin.java?view=diff&rev=505668&r1=505667&r2=505668
==============================================================================
--- 
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesPlugin.java
 (original)
+++ 
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesPlugin.java
 Sat Feb 10 01:57:21 2007
@@ -25,6 +25,7 @@
 import java.util.Map;
 
 import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -311,8 +312,18 @@
             String retValue = null;
             
             if (request instanceof ServletTilesRequestContext) {
+               HttpServletRequest servletRequest =
+                       (HttpServletRequest)((ServletTilesRequestContext) 
request).getRequest(); 
                 ModuleConfig config = 
ModuleUtils.getInstance().getModuleConfig(
-                        ((ServletTilesRequestContext) request).getRequest());
+                        servletRequest);
+
+                if (config == null) {
+                    // ModuleConfig not found in current request. Select it.
+                    ModuleUtils.getInstance().selectModule(servletRequest,
+                               
servletRequest.getSession().getServletContext());
+                    config = 
ModuleUtils.getInstance().getModuleConfig(servletRequest);
+                }
+                
                 if (config != null) {
                     retValue = config.getPrefix();
                 }