Return-Path: X-Original-To: apmail-jackrabbit-commits-archive@www.apache.org Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 23AD66A7C for ; Thu, 21 Jul 2011 08:30:58 +0000 (UTC) Received: (qmail 47184 invoked by uid 500); 21 Jul 2011 08:30:57 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 47087 invoked by uid 500); 21 Jul 2011 08:30:39 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 47080 invoked by uid 99); 21 Jul 2011 08:30:36 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 Jul 2011 08:30:36 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 Jul 2011 08:30:35 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 1D36623888C2; Thu, 21 Jul 2011 08:30:15 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1149069 - /jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/DavResourceFactoryImpl.java Date: Thu, 21 Jul 2011 08:30:14 -0000 To: commits@jackrabbit.apache.org From: angela@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110721083015.1D36623888C2@eris.apache.org> Author: angela Date: Thu Jul 21 08:30:12 2011 New Revision: 1149069 URL: http://svn.apache.org/viewvc?rev=1149069&view=rev Log: JCR-3004 - Check if a DAV-Request has a Label in the header, before checking if it's version-controlled (patch provided by christian stocker) Modified: jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/DavResourceFactoryImpl.java Modified: jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/DavResourceFactoryImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/DavResourceFactoryImpl.java?rev=1149069&r1=1149068&r2=1149069&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/DavResourceFactoryImpl.java (original) +++ jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/DavResourceFactoryImpl.java Thu Jul 21 08:30:12 2011 @@ -105,9 +105,9 @@ public class DavResourceFactoryImpl impl /* if the created resource is version-controlled and the request contains a Label header, the corresponding Version must be used instead.*/ - if (request instanceof DeltaVServletRequest && versionable && isVersionControlled(resource)) { + if (request instanceof DeltaVServletRequest && versionable) { String labelHeader = ((DeltaVServletRequest)request).getLabel(); - if (labelHeader != null && DavMethods.isMethodAffectedByLabel(request)) { + if (labelHeader != null && DavMethods.isMethodAffectedByLabel(request) && isVersionControlled(resource)) { Version v = ((Node)item).getVersionHistory().getVersionByLabel(labelHeader); DavResourceLocator vloc = locator.getFactory().createResourceLocator(locator.getPrefix(), locator.getWorkspacePath(), v.getPath(), false); resource = new VersionItemCollection(vloc, session, this, v); @@ -227,4 +227,4 @@ public class DavResourceFactoryImpl impl } return vc; } -} \ No newline at end of file +}