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 10:57:30 UTC
svn commit: r1368836 - in /jackrabbit/branches/2.4: ./
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java
Author: jukka
Date: Fri Aug 3 08:57:30 2012
New Revision: 1368836
URL: http://svn.apache.org/viewvc?rev=1368836&view=rev
Log:
2.4: Merged revision 1368796 (JCR-3399)
Modified:
jackrabbit/branches/2.4/ (props changed)
jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java
Propchange: jackrabbit/branches/2.4/
------------------------------------------------------------------------------
Merged /jackrabbit/trunk:r1368796
Modified: jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java?rev=1368836&r1=1368835&r2=1368836&view=diff
==============================================================================
--- jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java (original)
+++ jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java Fri Aug 3 08:57:30 2012
@@ -1502,18 +1502,18 @@ public class SharedItemStateManager
boolean holdingWriteLock = false;
ISMLocking.WriteLock wLock = null;
- try {
- wLock = acquireWriteLock(external);
- holdingWriteLock = true;
-
- doExternalUpdate(external);
- } catch (ItemStateException e) {
- String msg = "Unable to acquire write lock.";
- log.error(msg);
- }
-
ISMLocking.ReadLock rLock = null;
try {
+ try {
+ wLock = acquireWriteLock(external);
+ holdingWriteLock = true;
+
+ doExternalUpdate(external);
+ } catch (ItemStateException e) {
+ String msg = "Unable to acquire write lock.";
+ log.error(msg);
+ }
+
if (wLock != null) {
rLock = wLock.downgrade();
holdingWriteLock = false;