Return-Path: Delivered-To: apmail-incubator-jackrabbit-commits-archive@www.apache.org Received: (qmail 8878 invoked from network); 10 Nov 2005 13:14:06 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 10 Nov 2005 13:14:06 -0000 Received: (qmail 74701 invoked by uid 500); 10 Nov 2005 13:14:05 -0000 Mailing-List: contact jackrabbit-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: jackrabbit-dev@incubator.apache.org Delivered-To: mailing list jackrabbit-commits@incubator.apache.org Received: (qmail 74690 invoked by uid 500); 10 Nov 2005 13:14:05 -0000 Delivered-To: apmail-incubator-jackrabbit-cvs@incubator.apache.org Received: (qmail 74687 invoked by uid 99); 10 Nov 2005 13:14:05 -0000 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Thu, 10 Nov 2005 05:14:05 -0800 Received: (qmail 8721 invoked by uid 65534); 10 Nov 2005 13:13:44 -0000 Message-ID: <20051110131344.8720.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r332285 - in /incubator/jackrabbit/trunk/contrib/jcr-server: server/src/java/org/apache/jackrabbit/webdav/jcr/lock/JcrActiveLock.java webdav/src/java/org/apache/jackrabbit/webdav/lock/AbstractActiveLock.java Date: Thu, 10 Nov 2005 13:13:43 -0000 To: jackrabbit-cvs@incubator.apache.org From: angela@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: angela Date: Thu Nov 10 05:13:29 2005 New Revision: 332285 URL: http://svn.apache.org/viewcvs?rev=332285&view=rev Log: return infinite timeout for jcr-locks, even if the expirationdate cannot be determined from the lock. Modified: incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/webdav/jcr/lock/JcrActiveLock.java incubator/jackrabbit/trunk/contrib/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/lock/AbstractActiveLock.java Modified: incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/webdav/jcr/lock/JcrActiveLock.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/webdav/jcr/lock/JcrActiveLock.java?rev=332285&r1=332284&r2=332285&view=diff ============================================================================== --- incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/webdav/jcr/lock/JcrActiveLock.java (original) +++ incubator/jackrabbit/trunk/contrib/jcr-server/server/src/java/org/apache/jackrabbit/webdav/jcr/lock/JcrActiveLock.java Thu Nov 10 05:13:29 2005 @@ -78,7 +78,7 @@ */ public boolean isExpired() { try { - return lock.isLive(); + return !lock.isLive(); } catch (RepositoryException e) { log.error("Unexpected error: " + e.getMessage()); return false; @@ -115,17 +115,19 @@ } /** - * Always returns {@link DavConstants#UNDEFINED_TIMEOUT} for the timeout - * cannot be retrieved from the JCR lock. + * Since jcr locks do not reveal the time left until they expire, {@link #INFINITE_TIMEOUT} + * is returned. A missing timeout causes problems with Microsoft clients. * + * @return Always returns {@link #INFINITE_TIMEOUT} * @see ActiveLock#getTimeout() - * @see DavConstants#UNDEFINED_TIMEOUT */ public long getTimeout() { - return UNDEFINED_TIMEOUT; + return INFINITE_TIMEOUT; } /** + * Throws UnsupportedOperationException + * * @see ActiveLock#setTimeout(long) */ public void setTimeout(long timeout) { Modified: incubator/jackrabbit/trunk/contrib/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/lock/AbstractActiveLock.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/lock/AbstractActiveLock.java?rev=332285&r1=332284&r2=332285&view=diff ============================================================================== --- incubator/jackrabbit/trunk/contrib/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/lock/AbstractActiveLock.java (original) +++ incubator/jackrabbit/trunk/contrib/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/lock/AbstractActiveLock.java Thu Nov 10 05:13:29 2005 @@ -48,7 +48,7 @@ // timeout long timeout = getTimeout(); if (!isExpired() && timeout != UNDEFINED_TIMEOUT) { - activeLock.addContent(XmlUtil.timeoutToXml(getTimeout())); + activeLock.addContent(XmlUtil.timeoutToXml(timeout)); } // owner