Author: markt
Date: Thu Apr 17 10:27:26 2008
New Revision: 649195
URL: http://svn.apache.org/viewvc?rev=649195&view=rev
Log:
Fix bug 44428. Possible NPE in serialization.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/el/lang/FunctionMapperImpl.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=649195&r1=649194&r2=649195&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Apr 17 10:27:26 2008
@@ -65,12 +65,6 @@
+1: jfclere, rjung, fhanik, remm
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44428
- Prevent NPE
- http://svn.apache.org/viewvc?rev=646574&view=rev
- +1: markt, remm, fhanik
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44766
Handle custom subtypes of java.lang.Number
http://svn.apache.org/viewvc?view=rev&revision=646106
Modified: tomcat/tc6.0.x/trunk/java/org/apache/el/lang/FunctionMapperImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/el/lang/FunctionMapperImpl.java?rev=649195&r1=649194&r2=649195&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/el/lang/FunctionMapperImpl.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/el/lang/FunctionMapperImpl.java Thu
Apr 17 10:27:26 2008
@@ -120,6 +120,8 @@
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());
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=649195&r1=649194&r2=649195&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Apr 17 10:27:26 2008
@@ -142,6 +142,9 @@
<bug>44408</bug>: Reduce synchronisation when evaluating EL
expressions.
Patch provided by Robert Andersson. (markt)
</fix>
+ <fix>
+ <bug>44428</bug>: Fix possible NPE during serialization. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Webapps">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
