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 2010/08/11 17:37:15 UTC
svn commit: r984445 - in /jackrabbit/branches/1.4: ./
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java
Author: jukka
Date: Wed Aug 11 15:37:14 2010
New Revision: 984445
URL: http://svn.apache.org/viewvc?rev=984445&view=rev
Log:
1.4: Merged revision 984444 (JCR-2171)
Modified:
jackrabbit/branches/1.4/ (props changed)
jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java
Propchange: jackrabbit/branches/1.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 11 15:37:14 2010
@@ -1 +1,3 @@
-/jackrabbit/trunk:679389
+/jackrabbit/branches/1.5:984444
+/jackrabbit/branches/1.x:792219
+/jackrabbit/trunk:679389,792218
Modified: jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java?rev=984445&r1=984444&r2=984445&view=diff
==============================================================================
--- jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java (original)
+++ jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java Wed Aug 11 15:37:14 2010
@@ -755,13 +755,14 @@ public class SharedItemStateManager
ISMLocking.ReadLock readLock = null;
try {
- /* Let the shared item listeners know about the change */
- shared.persisted();
-
// downgrade to read lock
readLock = writeLock.downgrade();
writeLock = null;
+ // Let the shared item listeners know about the change
+ // JCR-2171: This must happen after downgrading the lock!
+ shared.persisted();
+
/* notify virtual providers about node references */
for (int i = 0; i < virtualNodeReferences.length; i++) {
List virtualRefs = virtualNodeReferences[i];