Author: markt
Date: Thu Jan 3 14:18:01 2013
New Revision: 1428355
URL: http://svn.apache.org/viewvc?rev=1428355&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54260
Avoid NPE when using JSP unloading and tag files.
Modified:
tomcat/trunk/java/org/apache/jasper/util/FastRemovalDequeue.java
Modified: tomcat/trunk/java/org/apache/jasper/util/FastRemovalDequeue.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/util/FastRemovalDequeue.java?rev=1428355&r1=1428354&r2=1428355&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/util/FastRemovalDequeue.java (original)
+++ tomcat/trunk/java/org/apache/jasper/util/FastRemovalDequeue.java Thu Jan 3
14:18:01 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();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
