Author: markt
Date: Sun Jul 11 16:37:32 2010
New Revision: 963106
URL: http://svn.apache.org/viewvc?rev=963106&view=rev
Log:
Make the fix for bug 49555 more robust
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java
tomcat/trunk/test/org/apache/el/TestELInJsp.java
tomcat/trunk/test/org/apache/el/TesterFunctions.java
tomcat/trunk/test/webapp-3.0/WEB-INF/bugs.tld
Modified: tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java?rev=963106&r1=963105&r2=963106&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java Sun Jul
11 16:37:32 2010
@@ -294,8 +294,14 @@ public class ELFunctionMapper {
* @param className Binary class name
* @return Canonical equivalent
*/
- private String getCanonicalName(String className) {
- return className.replace('$', '.');
+ private String getCanonicalName(String className) throws
JasperException {
+ Class<?> clazz;
+ try {
+ clazz = Class.forName(className);
+ } catch (ClassNotFoundException e) {
+ throw new JasperException(e);
+ }
+ return clazz.getCanonicalName();
}
}
}
Modified: tomcat/trunk/test/org/apache/el/TestELInJsp.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/TestELInJsp.java?rev=963106&r1=963105&r2=963106&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/el/TestELInJsp.java (original)
+++ tomcat/trunk/test/org/apache/el/TestELInJsp.java Sun Jul 11 16:37:32 2010
@@ -322,7 +322,7 @@ public class TestELInJsp extends TomcatB
"/test/bug49555.jsp");
String result = res.toString();
- assertEcho(result, "00-" + TesterFunctions.Inner.RETVAL);
+ assertEcho(result, "00-" + TesterFunctions.Inner$Class.RETVAL);
}
public void testELMisc() throws Exception {
Modified: tomcat/trunk/test/org/apache/el/TesterFunctions.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/TesterFunctions.java?rev=963106&r1=963105&r2=963106&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/el/TesterFunctions.java (original)
+++ tomcat/trunk/test/org/apache/el/TesterFunctions.java Sun Jul 11 16:37:32
2010
@@ -22,7 +22,7 @@ public class TesterFunctions {
return input.trim();
}
- public static class Inner {
+ public static class Inner$Class {
public static final String RETVAL = "Return from bug49555";
public static String bug49555() {
Modified: tomcat/trunk/test/webapp-3.0/WEB-INF/bugs.tld
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-3.0/WEB-INF/bugs.tld?rev=963106&r1=963105&r2=963106&view=diff
==============================================================================
--- tomcat/trunk/test/webapp-3.0/WEB-INF/bugs.tld (original)
+++ tomcat/trunk/test/webapp-3.0/WEB-INF/bugs.tld Sun Jul 11 16:37:32 2010
@@ -69,7 +69,7 @@
</tag>
<function>
<name>bug49555</name>
- <function-class>org.apache.el.TesterFunctions$Inner</function-class>
+ <function-class>org.apache.el.TesterFunctions$Inner$Class</function-class>
<function-signature>java.lang.String bug49555()</function-signature>
</function>
</taglib>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
