jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ang...@apache.org
Subject svn commit: r772910 - in /jackrabbit/trunk: jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/lock/LockManagerImpl.java jackrabbit-spi2jcr/pom.xml
Date Fri, 08 May 2009 10:07:08 GMT
Author: angela
Date: Fri May  8 10:07:08 2009
New Revision: 772910

URL: http://svn.apache.org/viewvc?rev=772910&view=rev
Log:
JCR-2004: Update SPI locking to match JCR 2.0
JCR-2097: Broke lock tests in jcr2spi after the JCR 2.0 upgrade

Modified:
    jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/lock/LockManagerImpl.java
    jackrabbit/trunk/jackrabbit-spi2jcr/pom.xml

Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/lock/LockManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/lock/LockManagerImpl.java?rev=772910&r1=772909&r2=772910&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/lock/LockManagerImpl.java
(original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/lock/LockManagerImpl.java
Fri May  8 10:07:08 2009
@@ -412,7 +412,7 @@
         // store in the lock map. see below (LockImpl) for the conditions that
         // must be met in order a lock can be stored.
         LockImpl l = getLockFromMap(nState);
-        if (l != null) {
+        if (l != null && l.lockState.appliesToNodeState(nodeState)) {
             return l;
         }
 

Modified: jackrabbit/trunk/jackrabbit-spi2jcr/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi2jcr/pom.xml?rev=772910&r1=772909&r2=772910&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi2jcr/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-spi2jcr/pom.xml Fri May  8 10:07:08 2009
@@ -70,12 +70,7 @@
                 org.apache.jackrabbit.jcr2spi.name.NamespaceRegistryTest#testReRegisteredNamespaceVisibility
                 org.apache.jackrabbit.jcr2spi.name.NamespaceRegistryTest#testRegisteredNamespaceVisibility
                 org.apache.jackrabbit.value.BinaryValueTest#testBinaryValueEquals
-                org.apache.jackrabbit.test.api.lock.LockTest
                 org.apache.jackrabbit.test.api.lock.LockManagerTest
-                org.apache.jackrabbit.test.api.lock.SessionScopedLockTest
-                org.apache.jackrabbit.test.api.lock.OpenScopedLockTest
-                org.apache.jackrabbit.test.api.lock.DeepLockTest
-                org.apache.jackrabbit.jcr2spi.lock.SessionScopedLockTest
                 org.apache.jackrabbit.test.api.observation.GetDateTest
                 org.apache.jackrabbit.test.api.observation.GetIdentifierTest
                 org.apache.jackrabbit.test.api.observation.GetInfoTest



Mime
View raw message