You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2020/04/22 13:16:01 UTC
svn commit: r1876827 - in /jackrabbit/oak/branches/1.8: ./ oak-jcr/
oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/NodeDelegate.java
Author: reschke
Date: Wed Apr 22 13:16:01 2020
New Revision: 1876827
URL: http://svn.apache.org/viewvc?rev=1876827&view=rev
Log:
OAK-8722: dead locking related code in NodeDelegate.updateMixins (merged r1869367 into 1.8)
Modified:
jackrabbit/oak/branches/1.8/ (props changed)
jackrabbit/oak/branches/1.8/oak-jcr/ (props changed)
jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/NodeDelegate.java
Propchange: jackrabbit/oak/branches/1.8/
------------------------------------------------------------------------------
Merged /jackrabbit/oak/trunk:r1869367
Propchange: jackrabbit/oak/branches/1.8/oak-jcr/
------------------------------------------------------------------------------
Merged /jackrabbit/oak/trunk/oak-jcr:r1869367
Modified: jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/NodeDelegate.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/NodeDelegate.java?rev=1876827&r1=1876826&r2=1876827&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/NodeDelegate.java (original)
+++ jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/NodeDelegate.java Wed Apr 22 13:16:01 2020
@@ -432,16 +432,7 @@ public class NodeDelegate extends ItemDe
tree.setProperty(JCR_MIXINTYPES, mixinNames, NAMES);
}
- // 3. deal with locked nodes
- boolean wasLockable = isNodeType(MIX_LOCKABLE);
- boolean isLockable = isNodeType(MIX_LOCKABLE);
- if (wasLockable && !isLockable && holdsLock(false)) {
- // TODO: This should probably be done in a commit hook
- unlock();
- sessionDelegate.refresh(true);
- }
-
- // 4. clean up set of properties and child nodes such that all child items
+ // 3. clean up set of properties and child nodes such that all child items
// have a valid item definition according to the effective node type present
// after having updated the mixin property. this includes removing all
// protected properties and child nodes associated with the removed mixin