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

[lukaszlenart]

Author: lukaszlenart
Date: Fri Mar 22 07:22:45 2013
New Revision: 1459650

URL: http://svn.apache.org/r1459650
Log:
WW-3997 Does small cleanup

Modified:
    
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.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=1459650&r1=1459649&r2=1459650&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 07:22:45 2013
@@ -336,8 +336,7 @@ public class DefaultActionMapper impleme
      * @param request The request
      * @param mapping The action mapping
      */
-    public void handleSpecialParameters(HttpServletRequest request,
-                                        ActionMapping mapping) {
+    public void handleSpecialParameters(HttpServletRequest request, 
ActionMapping mapping) {
         // handle special parameter prefixes.
         Set<String> uniqueParameters = new HashSet<String>();
         Map parameterMap = request.getParameterMap();
@@ -367,8 +366,7 @@ public class DefaultActionMapper impleme
      * @param uri     The uri
      * @param mapping The action mapping to populate
      */
-    protected void parseNameAndNamespace(String uri, ActionMapping mapping,
-                                         ConfigurationManager configManager) {
+    protected void parseNameAndNamespace(String uri, ActionMapping mapping, 
ConfigurationManager configManager) {
         String namespace, name;
         int lastSlash = uri.lastIndexOf("/");
         if (lastSlash == -1) {
@@ -411,7 +409,7 @@ public class DefaultActionMapper impleme
             }
         }
 
-        if (!allowSlashesInActionNames && name != null) {
+        if (!allowSlashesInActionNames) {
             int pos = name.lastIndexOf('/');
             if (pos > -1 && pos < name.length() - 1) {
                 name = name.substring(pos + 1);