Author: pbenedict Date: Thu Feb 15 20:56:54 2007 New Revision: 508312 URL: http://svn.apache.org/viewvc?view=rev&rev=508312 Log: Add check for empty strings
Modified: struts/struts1/branches/STRUTS_1_3_BRANCH/core/src/main/java/org/apache/struts/chain/commands/servlet/SelectAction.java Modified: struts/struts1/branches/STRUTS_1_3_BRANCH/core/src/main/java/org/apache/struts/chain/commands/servlet/SelectAction.java URL: http://svn.apache.org/viewvc/struts/struts1/branches/STRUTS_1_3_BRANCH/core/src/main/java/org/apache/struts/chain/commands/servlet/SelectAction.java?view=diff&rev=508312&r1=508311&r2=508312 ============================================================================== --- struts/struts1/branches/STRUTS_1_3_BRANCH/core/src/main/java/org/apache/struts/chain/commands/servlet/SelectAction.java (original) +++ struts/struts1/branches/STRUTS_1_3_BRANCH/core/src/main/java/org/apache/struts/chain/commands/servlet/SelectAction.java Thu Feb 15 20:56:54 2007 @@ -46,20 +46,20 @@ // For prefix matching, match on the path info path = (String) request.getAttribute(Constants.INCLUDE_PATH_INFO); - if (path == null) { + if ((path == null) || (path.length() == 0)) { path = request.getPathInfo(); } // For extension matching, match on the servlet path - if (path == null) { + if ((path == null) || (path.length() == 0)) { path = (String) request.getAttribute(Constants.INCLUDE_SERVLET_PATH); - if (path == null) { + if ((path == null) || (path.length() == 0)) { path = request.getServletPath(); } - if (path == null) { + if ((path == null) || (path.length() == 0)) { throw new IllegalArgumentException( "No path information in request"); }