Author: chetanm
Date: Thu Oct 8 06:06:40 2015
New Revision: 1707435
URL: http://svn.apache.org/viewvc?rev=1707435&view=rev
Log:
OAK-3476 - Memory leak caused by using marker names based on non static session
id
Modified:
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/SessionDelegate.java
Modified:
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/SessionDelegate.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/SessionDelegate.java?rev=1707435&r1=1707434&r2=1707435&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/SessionDelegate.java
(original)
+++
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/SessionDelegate.java
Thu Oct 8 06:06:40 2015
@@ -66,8 +66,6 @@ import org.apache.jackrabbit.oak.stats.C
import org.apache.jackrabbit.oak.stats.StatisticManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.slf4j.Marker;
-import org.slf4j.MarkerFactory;
/**
* TODO document
@@ -648,13 +646,12 @@ public class SessionDelegate {
if (readOperationLogger.isTraceEnabled()
|| writeOperationLogger.isTraceEnabled()
|| auditLogger.isDebugEnabled()) {
- Marker sessionMarker = MarkerFactory.getMarker(session.toString());
Logger log = ops.isUpdate() ? writeOperationLogger :
readOperationLogger;
- log.trace(sessionMarker, "[{}] {}", session, ops);
+ log.trace("[{}] {}", session, ops);
//For a logout operation the auth info is not accessible
if (!ops.isLogout() && !ops.isRefresh() && !ops.isSave() &&
ops.isUpdate()) {
- auditLogger.debug(sessionMarker, "[{}] [{}] {}",
session.getAuthInfo().getUserID(), session, ops);
+ auditLogger.debug("[{}] [{}] {}",
session.getAuthInfo().getUserID(), session, ops);
}
}
}