jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tri...@apache.org
Subject svn commit: r314914 - /incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/VersionManagerImpl.java
Date Wed, 12 Oct 2005 14:11:13 GMT
Author: tripod
Date: Wed Oct 12 07:11:09 2005
New Revision: 314914

URL: http://svn.apache.org/viewcvs?rev=314914&view=rev
Log:
- fixing potential deadlock in versioning

Modified:
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/VersionManagerImpl.java

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/VersionManagerImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/VersionManagerImpl.java?rev=314914&r1=314913&r2=314914&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/VersionManagerImpl.java
(original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/VersionManagerImpl.java
Wed Oct 12 07:11:09 2005
@@ -409,7 +409,7 @@
      * @return
      * @throws RepositoryException
      */
-    public synchronized Version checkin(NodeImpl node) throws RepositoryException {
+    public Version checkin(NodeImpl node) throws RepositoryException {
         SessionImpl session = (SessionImpl) node.getSession();
         InternalVersion version = internalCheckin(node);
 
@@ -439,7 +439,7 @@
      * @throws RepositoryException
      * @see javax.jcr.Node#checkin()
      */
-    private InternalVersion internalCheckin(NodeImpl node) throws RepositoryException {
+    private synchronized InternalVersion internalCheckin(NodeImpl node) throws RepositoryException
{
         // assuming node is versionable and checkout (check in nodeimpl)
         // To create a new version of a versionable node N, the client calls N.checkin.
         // This causes the following series of events:



Mime
View raw message