Author: thomasm
Date: Fri Jul 29 13:13:29 2016
New Revision: 1754515
URL: http://svn.apache.org/viewvc?rev=1754515&view=rev
Log:
OAK-4622 SessionDelegate.lock speedup
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=1754515&r1=1754514&r2=1754515&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
Fri Jul 29 13:13:29 2016
@@ -735,19 +735,19 @@ public class SessionDelegate {
this.lock = lock;
}
- public void lock(boolean isUpdate, String opName) {
+ public void lock(boolean isUpdate, Object operation) {
if (!lock.tryLock()) {
// Acquire the lock before logging the warnings. As otherwise
race conditions
// on the involved fields might lead to wrong warnings.
lock.lock();
if (holderThread != null) {
if (this.isUpdate) {
- warn(log, "Attempted to perform " + opName + " while
thread " + holderThread +
+ warn(log, "Attempted to perform " +
operation.toString() + " while thread " + holderThread +
" was concurrently writing to this session.
Blocked until the " +
"other thread finished using this session.
Please review your code " +
"to avoid concurrent use of a session.",
holderTrace);
} else if (log.isDebugEnabled()) {
- log.debug("Attempted to perform " + opName + " while
thread " + holderThread +
+ log.debug("Attempted to perform " +
operation.toString() + " while thread " + holderThread +
" was concurrently reading from this session.
Blocked until the " +
"other thread finished using this session.
Please review your code " +
"to avoid concurrent use of a session.",
holderTrace);
@@ -770,7 +770,7 @@ public class SessionDelegate {
}
public void lock(SessionOperation<?> sessionOperation) {
- lock(sessionOperation.isUpdate(), sessionOperation.toString());
+ lock(sessionOperation.isUpdate(), sessionOperation);
}
@Override
