svn commit: r1701607 - /tomcat/trunk/java/org/apache/jasper/util/FastRemovalDequeue.java

[markt]

Author: markt
Date: Mon Sep  7 11:11:49 2015
New Revision: 1701607

URL: http://svn.apache.org/r1701607
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58296
Fix memory leak in JSP unloading

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=1701607&r1=1701606&r2=1701607&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/util/FastRemovalDequeue.java (original)
+++ tomcat/trunk/java/org/apache/jasper/util/FastRemovalDequeue.java Mon Sep  7 
11:11:49 2015
@@ -44,6 +44,7 @@ package org.apache.jasper.util;
  * and reinsert it in front or at the end in constant time.
  * So keeping the list sorted is very cheap.
  *
+ * @param <T> The type of elements in the queue
  */
 public class FastRemovalDequeue<T> {
 
@@ -56,7 +57,12 @@ public class FastRemovalDequeue<T> {
     /** Size of the queue */
     private int size;
 
-    /** Initialize empty queue. */
+    /**
+     * Initialize empty queue.
+     *
+     * @param maxSize The maximum size to which the queue will be allowed to
+     *                grow
+     */
     public FastRemovalDequeue(int maxSize) {
         if (maxSize <=1 ) {
             maxSize = 2;
@@ -143,7 +149,7 @@ public class FastRemovalDequeue<T> {
                 first.setPrevious(null);
             }
             size--;
-            element.setValid(false);
+            element.invalidate();
         }
         return content;
     }
@@ -165,14 +171,16 @@ public class FastRemovalDequeue<T> {
                 last.setNext(null);
             }
             size--;
-            element.setValid(false);
+            element.invalidate();
         }
         return content;
     }
 
     /**
      * Removes any element of the list and returns its content.
-     **/
+     *
+     * @param element The element to remove
+     */
     public synchronized void remove(final Entry element) {
         if (element == null || !element.getValid()) {
             return;
@@ -190,7 +198,7 @@ public class FastRemovalDequeue<T> {
             first = next;
         }
         size--;
-        element.setValid(false);
+        element.invalidate();
     }
 
     /**
@@ -272,8 +280,10 @@ public class FastRemovalDequeue<T> {
             return valid;
         }
 
-        private final void setValid(final boolean valid) {
-            this.valid = valid;
+        private final void invalidate() {
+            this.valid = false;
+            this.previous = null;
+            this.next = null;
         }
 
         public final T getContent() {



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