From a4d40d90adc119c3d1b983ea58635062410be976 Mon Sep 17 00:00:00 2001 From: markt Date: Wed, 9 Apr 2008 22:33:01 +0000 Subject: [PATCH] Fix bug 44428. Make sure m is not null to prevent NPE. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@646574 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/el/lang/FunctionMapperImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/java/org/apache/el/lang/FunctionMapperImpl.java b/java/org/apache/el/lang/FunctionMapperImpl.java index a225e3b73..de60ddb01 100644 --- a/java/org/apache/el/lang/FunctionMapperImpl.java +++ b/java/org/apache/el/lang/FunctionMapperImpl.java @@ -120,6 +120,8 @@ public class FunctionMapperImpl extends FunctionMapper implements public void writeExternal(ObjectOutput out) throws IOException { out.writeUTF((this.prefix != null) ? this.prefix : ""); out.writeUTF(this.localName); + // make sure m isn't null + getMethod(); out.writeUTF((this.owner != null) ? this.owner : this.m.getDeclaringClass().getName()); -- 2.11.0