You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2016/05/23 15:04:56 UTC

struts git commit: Allows empty string as a action name

Repository: struts
Updated Branches:
  refs/heads/support-2-3 54e8bf1f7 -> 34025eafe


Allows empty string as a action name


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/34025eaf
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/34025eaf
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/34025eaf

Branch: refs/heads/support-2-3
Commit: 34025eafec80bdff6e5a0fac2ad223329246a595
Parents: 54e8bf1
Author: Lukasz Lenart <lu...@apache.org>
Authored: Mon May 23 17:04:38 2016 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Mon May 23 17:04:38 2016 +0200

----------------------------------------------------------------------
 .../org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts/blob/34025eaf/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java b/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
index cacc82c..529e033 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
@@ -120,7 +120,7 @@ public class DefaultActionMapper implements ActionMapper {
     protected boolean allowSlashesInActionNames = false;
     protected boolean alwaysSelectFullNamespace = false;
     protected PrefixTrie prefixTrie = null;
-    protected Pattern allowedActionNames = Pattern.compile("^[a-zA-Z0-9_!/\\-]+((.htm[l]?)|(.action))?$");
+    protected Pattern allowedActionNames = Pattern.compile("^[a-zA-Z0-9_!/\\-]*((.htm[l]?)|(.action))?$");
     private boolean allowActionPrefix = false;
     private boolean allowActionCrossNamespaceAccess = false;