svn commit: r1459645 - in /struts/struts2/trunk/core/src: main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java

[lu...@apache.org]

Author: lukaszlenart
Date: Fri Mar 22 06:45:02 2013
New Revision: 1459645

URL: http://svn.apache.org/r1459645
Log:
WW-3997 Reverts logic regarding empty action name to allow UnknownHandler work

Modified:
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java?rev=1459645&r1=1459644&r2=1459645&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java Fri Mar 22 06:45:02 2013
@@ -295,8 +295,7 @@ public class DefaultActionMapper impleme
      *
      * @see org.apache.struts2.dispatcher.mapper.ActionMapper#getMapping(javax.servlet.http.HttpServletRequest)
      */
-    public ActionMapping getMapping(HttpServletRequest request,
-                                    ConfigurationManager configManager) {
+    public ActionMapping getMapping(HttpServletRequest request, ConfigurationManager configManager) {
         ActionMapping mapping = new ActionMapping();
         String uri = getUri(request);
 
@@ -309,22 +308,13 @@ public class DefaultActionMapper impleme
         }
 
         parseNameAndNamespace(uri, mapping, configManager);
-
         handleSpecialParameters(request, mapping);
-
-        // if Action name is empty it can be a request to static resource, return null to handle that case
-        if (StringUtils.isEmpty(mapping.getName())) {
-            return null;
-        }
-
-        parseActionName(mapping);
-
-        return mapping;
+        return parseActionName(mapping);
     }
 
     protected ActionMapping parseActionName(ActionMapping mapping) {
         if (mapping.getName() == null) {
-            return mapping;
+            return null;
         }
         if (allowDynamicMethodCalls) {
             // handle "name!method" convention.

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java?rev=1459645&r1=1459644&r2=1459645&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java Fri Mar 22 06:45:02 2013
@@ -21,17 +21,6 @@
 
 package org.apache.struts2.dispatcher.mapper;
 
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.struts2.ServletActionContext;
-import org.apache.struts2.StrutsTestCase;
-import org.apache.struts2.dispatcher.ServletRedirectResult;
-import org.apache.struts2.dispatcher.StrutsResultSupport;
-import org.apache.struts2.views.jsp.StrutsMockHttpServletRequest;
-import org.apache.struts2.views.jsp.StrutsMockHttpServletResponse;
-
 import com.mockobjects.dynamic.Mock;
 import com.mockobjects.servlet.MockHttpServletRequest;
 import com.opensymphony.xwork2.ActionContext;
@@ -41,6 +30,16 @@ import com.opensymphony.xwork2.config.Co
 import com.opensymphony.xwork2.config.ConfigurationManager;
 import com.opensymphony.xwork2.config.entities.PackageConfig;
 import com.opensymphony.xwork2.config.impl.DefaultConfiguration;
+import org.apache.struts2.ServletActionContext;
+import org.apache.struts2.StrutsTestCase;
+import org.apache.struts2.dispatcher.ServletRedirectResult;
+import org.apache.struts2.dispatcher.StrutsResultSupport;
+import org.apache.struts2.views.jsp.StrutsMockHttpServletRequest;
+import org.apache.struts2.views.jsp.StrutsMockHttpServletResponse;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * DefaultActionMapper test case.
@@ -257,8 +256,7 @@ public class DefaultActionMapperTest ext
     public void testGetMappingWithActionName_null() throws Exception {
         DefaultActionMapper mapper = new DefaultActionMapper();
         ActionMapping mapping = mapper.getMappingFromActionName(null);
-        assertEquals(null, mapping.getName());
-        assertEquals(null, mapping.getMethod());
+        assertNull(mapping);
     }
 
     public void testGetUri() throws Exception {