Author: mrdon
Date: Sat Jun 18 22:32:33 2005
New Revision: 191321
URL: http://svn.apache.org/viewcvs?rev=191321&view=rev
Log:
Filter anchors out when determining action mapping name
PR: 21614
Modified:
struts/taglib/trunk/src/java/org/apache/struts/taglib/TagUtils.java
struts/taglib/trunk/src/test/org/apache/struts/taglib/TestTagUtils.java
Modified: struts/taglib/trunk/src/java/org/apache/struts/taglib/TagUtils.java
URL:
http://svn.apache.org/viewcvs/struts/taglib/trunk/src/java/org/apache/struts/taglib/TagUtils.java?rev=191321&r1=191320&r2=191321&view=diff
==============================================================================
--- struts/taglib/trunk/src/java/org/apache/struts/taglib/TagUtils.java
(original)
+++ struts/taglib/trunk/src/java/org/apache/struts/taglib/TagUtils.java Sat Jun
18 22:32:33 2005
@@ -665,6 +665,12 @@
value = value.substring(0, question);
}
+ int pound = value.indexOf("#");
+ if (pound >= 0) {
+ value = value.substring(0, pound);
+ }
+
+
int slash = value.lastIndexOf("/");
int period = value.lastIndexOf(".");
if ((period >= 0) && (period > slash)) {
Modified:
struts/taglib/trunk/src/test/org/apache/struts/taglib/TestTagUtils.java
URL:
http://svn.apache.org/viewcvs/struts/taglib/trunk/src/test/org/apache/struts/taglib/TestTagUtils.java?rev=191321&r1=191320&r2=191321&view=diff
==============================================================================
--- struts/taglib/trunk/src/test/org/apache/struts/taglib/TestTagUtils.java
(original)
+++ struts/taglib/trunk/src/test/org/apache/struts/taglib/TestTagUtils.java Sat
Jun 18 22:32:33 2005
@@ -1652,6 +1652,7 @@
String[] appends = {
"",
+ "#anchor",
"?",
"?#",
"?foo=bar",
@@ -1684,7 +1685,7 @@
}
log.debug(ct + " assertions run in this test");
}
-
+
public void testString_getActionMappingURL_String_PageContext(){
ActionConfig actionConfig = new ActionConfig();
actionConfig.setParameter("/foo");
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
