You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by da...@apache.org on 2015/08/04 15:22:55 UTC
svn commit: r1694059 -
/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/ClusterNode.java
Author: davide
Date: Tue Aug 4 13:22:55 2015
New Revision: 1694059
URL: http://svn.apache.org/r1694059
Log:
JCR-3888 - Possible dead lock in SharedItemStateManager in clustered environment
- reverting r1687018 as it was introducing a regression. Unlocking the release of 2.10.2.
Modified:
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/ClusterNode.java
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/ClusterNode.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/ClusterNode.java?rev=1694059&r1=1694058&r2=1694059&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/ClusterNode.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/ClusterNode.java Tue Aug 4 13:22:55 2015
@@ -697,12 +697,11 @@ public class ClusterNode implements Runn
return;
}
try {
+ long journalUpdateSize = record.update();
long recordRevision = record.getRevision();
setRevision(recordRevision);
- long journalUpdateSize = record.update();
-
log.debug("Stored record '{}' to Journal ({})", recordRevision, journalUpdateSize);
Object updateSizeValue = update.getAttribute(ATTRIBUTE_UPDATE_SIZE);