tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1428358 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/jasper/util/FastRemovalDequeue.java webapps/docs/changelog.xml
Date Thu, 03 Jan 2013 14:19:55 GMT
Author: markt
Date: Thu Jan  3 14:19:55 2013
New Revision: 1428358

URL: http://svn.apache.org/viewvc?rev=1428358&view=rev
Log:
Avoid NPE when using JSP unloading and tag files.

Modified:
    tomcat/tc7.0.x/trunk/   (props changed)
    tomcat/tc7.0.x/trunk/java/org/apache/jasper/util/FastRemovalDequeue.java
    tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
  Merged /tomcat/trunk:r1428355

Modified: tomcat/tc7.0.x/trunk/java/org/apache/jasper/util/FastRemovalDequeue.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/util/FastRemovalDequeue.java?rev=1428358&r1=1428357&r2=1428358&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/util/FastRemovalDequeue.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/util/FastRemovalDequeue.java Thu Jan  3 14:19:55
2013
@@ -174,7 +174,7 @@ public class FastRemovalDequeue<T> {
      * Removes any element of the list and returns its content.
      **/
     public synchronized void remove(final Entry element) {
-        if (!element.getValid()) {
+        if (element == null || !element.getValid()) {
             return;
         }
         Entry next = element.getNext();

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1428358&r1=1428357&r2=1428358&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Jan  3 14:19:55 2013
@@ -88,6 +88,10 @@
         ForEach tag plug-in implementation. Patch provided by Sheldon Shao.
         (markt)
       </fix>
+      <fix>
+        <bug>54260</bug>: Avoid <code>NullPointerException</code>
when using
+        JSP unloading and tag files. (markt)  
+      </fix>
     </changelog>
   </subsection>
 </section>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message