jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From un...@apache.org
Subject svn commit: r1656414 - /jackrabbit/branches/2.8/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/lock/LockManagerImpl.java
Date Mon, 02 Feb 2015 08:49:41 GMT
Author: unico
Date: Mon Feb  2 08:49:41 2015
New Revision: 1656414

URL: http://svn.apache.org/r1656414
Log:
JCR-3814 make sure ISM is in edit mode when calling cancel on it

Modified:
    jackrabbit/branches/2.8/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/lock/LockManagerImpl.java

Modified: jackrabbit/branches/2.8/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/lock/LockManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.8/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/lock/LockManagerImpl.java?rev=1656414&r1=1656413&r2=1656414&view=diff
==============================================================================
--- jackrabbit/branches/2.8/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/lock/LockManagerImpl.java
(original)
+++ jackrabbit/branches/2.8/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/lock/LockManagerImpl.java
Mon Feb  2 08:49:41 2015
@@ -976,13 +976,13 @@ public class LockManagerImpl
 
         try {
             acquireLockPropertiesLock();
-            
+
+            // add properties to content
+            if (stateMgr.inEditMode()) {
+                throw new RepositoryException("Unable to remove lock properties.");
+            }
+            stateMgr.edit();
             try {
-                // add properties to content
-                if (stateMgr.inEditMode()) {
-                    throw new RepositoryException("Unable to remove lock properties.");
-                }
-                stateMgr.edit();
 
                 NodeId nodeId = node.getNodeId();
                 NodeState nodeState = (NodeState) stateMgr.getItemState(nodeId);



Mime
View raw message