You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2006/11/24 21:07:56 UTC

svn commit: r478974 - /jackrabbit/branches/1.1/jackrabbit/src/main/java/org/apache/jackrabbit/core/NodeImpl.java

Author: jukka
Date: Fri Nov 24 12:07:55 2006
New Revision: 478974

URL: http://svn.apache.org/viewvc?view=rev&rev=478974
Log:
1.1: Merged revision 474372 (JCR-67)

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

Modified: jackrabbit/branches/1.1/jackrabbit/src/main/java/org/apache/jackrabbit/core/NodeImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.1/jackrabbit/src/main/java/org/apache/jackrabbit/core/NodeImpl.java?view=diff&rev=478974&r1=478973&r2=478974
==============================================================================
--- jackrabbit/branches/1.1/jackrabbit/src/main/java/org/apache/jackrabbit/core/NodeImpl.java (original)
+++ jackrabbit/branches/1.1/jackrabbit/src/main/java/org/apache/jackrabbit/core/NodeImpl.java Fri Nov 24 12:07:55 2006
@@ -2643,7 +2643,9 @@
         }
 
         // check lock status
-        if (isLocked()) {
+        try {
+            checkLock();
+        } catch (LockException le) {
             return false;
         }