jackrabbit-commits mailing list archives

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

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

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

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



Mime
View raw message