You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by st...@apache.org on 2006/11/13 16:39:27 UTC

svn commit: r474372 - /jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/NodeImpl.java

Author: stefan
Date: Mon Nov 13 07:39:27 2006
New Revision: 474372

URL: http://svn.apache.org/viewvc?view=rev&rev=474372
Log:
JCR-67: Node.canAddMixin(String) incorrectly returns false when node is locked by current session

Modified:
    jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/NodeImpl.java

Modified: jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/NodeImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/NodeImpl.java?view=diff&rev=474372&r1=474371&r2=474372
==============================================================================
--- jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/NodeImpl.java (original)
+++ jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/NodeImpl.java Mon Nov 13 07:39:27 2006
@@ -2644,7 +2644,9 @@
         }
 
         // check lock status
-        if (isLocked()) {
+        try {
+            checkLock();
+        } catch (LockException le) {
             return false;
         }