Author: markt
Date: Mon Feb 16 17:20:40 2015
New Revision: 1660168
URL: http://svn.apache.org/r1660168
Log:
Add some debug information to memory leak tests that are currently failing on
Gump.
Modified:
tomcat/trunk/test/org/apache/tomcat/unittest/TesterCounter.java
tomcat/trunk/test/org/apache/tomcat/unittest/TesterLeakingServlet1.java
tomcat/trunk/test/org/apache/tomcat/unittest/TesterLeakingServlet2.java
Modified: tomcat/trunk/test/org/apache/tomcat/unittest/TesterCounter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/unittest/TesterCounter.java?rev=1660168&r1=1660167&r2=1660168&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/unittest/TesterCounter.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/unittest/TesterCounter.java Mon Feb 16
17:20:40 2015
@@ -16,7 +16,18 @@
*/
package org.apache.tomcat.unittest;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+
public class TesterCounter {
+
+ private static final Log log = LogFactory.getLog(TesterCounter.class);
+
+ static {
+ log.info("TestCounter loaded by " +
TesterCounter.class.getClassLoader() +
+ " in thread " + Thread.currentThread().getName());
+ }
+
private int count = 0;
public void increment() {
Modified:
tomcat/trunk/test/org/apache/tomcat/unittest/TesterLeakingServlet1.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/unittest/TesterLeakingServlet1.java?rev=1660168&r1=1660167&r2=1660168&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/unittest/TesterLeakingServlet1.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/unittest/TesterLeakingServlet1.java Mon
Feb 16 17:20:40 2015
@@ -23,8 +23,13 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+
public class TesterLeakingServlet1 extends HttpServlet {
+ private static final Log log =
LogFactory.getLog(TesterLeakingServlet1.class);
+
private static final long serialVersionUID = 1L;
private ThreadLocal<TesterCounter> myThreadLocal = new ThreadLocal<>();
@@ -36,6 +41,7 @@ public class TesterLeakingServlet1 exten
TesterCounter counter = myThreadLocal.get();
if (counter == null) {
+ log.info("Adding thread local to thread " +
Thread.currentThread().getName());
counter = new TesterCounter();
myThreadLocal.set(counter);
}
Modified:
tomcat/trunk/test/org/apache/tomcat/unittest/TesterLeakingServlet2.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/unittest/TesterLeakingServlet2.java?rev=1660168&r1=1660167&r2=1660168&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/unittest/TesterLeakingServlet2.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/unittest/TesterLeakingServlet2.java Mon
Feb 16 17:20:40 2015
@@ -25,10 +25,15 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+
public class TesterLeakingServlet2 extends HttpServlet {
private static final long serialVersionUID = 1L;
+ private static final Log log =
LogFactory.getLog(TesterLeakingServlet2.class);
+
@Override
protected void doGet(HttpServletRequest request,
@@ -38,6 +43,7 @@ public class TesterLeakingServlet2 exten
List<TesterCounter> counterList =
TesterThreadScopedHolder.getFromHolder();
TesterCounter counter;
if (counterList == null) {
+ log.info("Adding thread local to thread " +
Thread.currentThread().getName());
counter = new TesterCounter();
TesterThreadScopedHolder.saveInHolder(Arrays.asList(counter));
} else {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
