svn commit: r496932 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapper.java

[mrdon]

Author: mrdon
Date: Tue Jan 16 20:12:46 2007
New Revision: 496932

URL: http://svn.apache.org/viewvc?view=rev&rev=496932
Log:
Better handling case where action mapping cannot be found when using restful2
WW-1648

Modified:
    
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapper.java

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapper.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapper.java?view=diff&rev=496932&r1=496931&r2=496932
==============================================================================
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapper.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapper.java
 Tue Jan 16 20:12:46 2007
@@ -93,6 +93,10 @@
     public ActionMapping getMapping(HttpServletRequest request, 
ConfigurationManager configManager) {
 
         ActionMapping mapping = super.getMapping(request, configManager);
+        
+        if (mapping == null) {
+            return null;
+        }
 
         String actionName = mapping.getName();