jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cko...@apache.org
Subject svn commit: r1492642 - /jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/lock/LockManagerImpl.java
Date Thu, 13 Jun 2013 12:31:13 GMT
Author: ckoell
Date: Thu Jun 13 12:31:13 2013
New Revision: 1492642

URL: http://svn.apache.org/r1492642
Log:
JCR-3605 Possible Deadlock during TimeoutHandler is running

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

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/lock/LockManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/lock/LockManagerImpl.java?rev=1492642&r1=1492641&r2=1492642&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/lock/LockManagerImpl.java
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/lock/LockManagerImpl.java
Thu Jun 13 12:31:13 2013
@@ -185,10 +185,13 @@ public class LockManagerImpl
                     holder = sysSession;
                 }
                 try {
+                	acquire();
                     // FIXME: This session access is not thread-safe!
                     unlock(holder.getNodeById(id));
                 } catch (RepositoryException e) {
                     log.warn("Unable to expire the lock " + id, e);
+                } finally {
+                	release();
                 }
             }
         }



Mime
View raw message