You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2012/08/03 12:15:09 UTC
svn commit: r1368865 - in /jackrabbit/branches/2.4: ./
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/AbstractJournal.java
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/JournalLock.java
Author: jukka
Date: Fri Aug 3 10:15:09 2012
New Revision: 1368865
URL: http://svn.apache.org/viewvc?rev=1368865&view=rev
Log:
2.4: Merged revision 1354499 (JCR-3354)
Added:
jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/JournalLock.java
- copied unchanged from r1354499, jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/JournalLock.java
Modified:
jackrabbit/branches/2.4/ (props changed)
jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/AbstractJournal.java
Propchange: jackrabbit/branches/2.4/
------------------------------------------------------------------------------
Merged /jackrabbit/trunk:r1354499
Modified: jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/AbstractJournal.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/AbstractJournal.java?rev=1368865&r1=1368864&r2=1368865&view=diff
==============================================================================
--- jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/AbstractJournal.java (original)
+++ jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/AbstractJournal.java Fri Aug 3 10:15:09 2012
@@ -30,7 +30,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import EDU.oswego.cs.dl.util.concurrent.ReadWriteLock;
-import EDU.oswego.cs.dl.util.concurrent.ReentrantWriterPreferenceReadWriteLock;
/**
* Base journal implementation.
@@ -71,7 +70,7 @@ public abstract class AbstractJournal im
* Journal lock, allowing multiple readers (synchronizing their contents)
* but only one writer (appending a new entry).
*/
- private final ReadWriteLock rwLock = new ReentrantWriterPreferenceReadWriteLock();
+ private final ReadWriteLock rwLock = new JournalLock();
/**
* The path of the local revision file on disk. Configurable through the repository.xml.