bug 41797: CNFE/NPE thrown from function mapper when externalizing

Patch by Tuomas Kiviaho- tuomas.kiviahos at ikis fi

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@578466 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/el/lang/FunctionMapperImpl.java b/java/org/apache/el/lang/FunctionMapperImpl.java
index 0a938d0..a101994 100644 (file)
--- a/java/org/apache/el/lang/FunctionMapperImpl.java
+++ b/java/org/apache/el/lang/FunctionMapperImpl.java
@@ -144,7 +144,7 @@ public class FunctionMapperImpl extends FunctionMapper implements
         public Method getMethod() {
             if (this.m == null) {
                 try {
-                    Class t = Class.forName(this.owner);
+                    Class t = ReflectionUtil.forName(this.owner);
                     Class[] p = ReflectionUtil.toTypeArray(this.types);
                     this.m = t.getMethod(this.name, p);
                 } catch (Exception e) {

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 0230159..66ce17d 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -98,6 +98,10 @@
         <bug>43338</bug>: Support '*' servlet-name mapping at filter-mapping.
         Patch provided by Keiichi Fujino. (pero)
       </fix>
+      <fix>
+        <bug>41797</bug>: CNFE/NPE thrown from function mapper when externalizing
+        Patch by Tuomas Kiviaho- tuomas.kiviahos at ikis fi
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">