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 3B271106B9 for ; Fri, 19 Apr 2013 18:06:47 +0000 (UTC) Received: (qmail 8305 invoked by uid 500); 19 Apr 2013 18:06:47 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 8268 invoked by uid 500); 19 Apr 2013 18:06:47 -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 8261 invoked by uid 99); 19 Apr 2013 18:06:47 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Apr 2013 18:06:46 +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; Fri, 19 Apr 2013 18:06:45 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 723E223888EA; Fri, 19 Apr 2013 18:06:25 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1469975 - in /jackrabbit/branches/2.4: ./ jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/AbstractLocatorFactory.java jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/WebdavRequestImpl.java Date: Fri, 19 Apr 2013 18:06:25 -0000 To: commits@jackrabbit.apache.org From: reschke@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130419180625.723E223888EA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: reschke Date: Fri Apr 19 18:06:25 2013 New Revision: 1469975 URL: http://svn.apache.org/r1469975 Log: JCR-3565: undo incorrect changes (ported to 2.4) Modified: jackrabbit/branches/2.4/ (props changed) jackrabbit/branches/2.4/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/AbstractLocatorFactory.java jackrabbit/branches/2.4/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/WebdavRequestImpl.java Propchange: jackrabbit/branches/2.4/ ------------------------------------------------------------------------------ Merged /jackrabbit/trunk:r1469940 Modified: jackrabbit/branches/2.4/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/AbstractLocatorFactory.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/AbstractLocatorFactory.java?rev=1469975&r1=1469974&r2=1469975&view=diff ============================================================================== --- jackrabbit/branches/2.4/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/AbstractLocatorFactory.java (original) +++ jackrabbit/branches/2.4/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/AbstractLocatorFactory.java Fri Apr 19 18:06:25 2013 @@ -88,10 +88,6 @@ public abstract class AbstractLocatorFac throw new IllegalArgumentException("Request handle must not be null."); } - if (prefix == null || prefix.length() == 0) { - throw new IllegalArgumentException("Prefix must be an absolute URI."); - } - // build prefix string and remove all prefixes from the given href. StringBuffer b = new StringBuffer(""); if (prefix != null && prefix.length() > 0) { Modified: jackrabbit/branches/2.4/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/WebdavRequestImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/WebdavRequestImpl.java?rev=1469975&r1=1469974&r2=1469975&view=diff ============================================================================== --- jackrabbit/branches/2.4/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/WebdavRequestImpl.java (original) +++ jackrabbit/branches/2.4/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/WebdavRequestImpl.java Fri Apr 19 18:06:25 2013 @@ -88,7 +88,6 @@ public class WebdavRequestImpl implement private final DavLocatorFactory factory; private final IfHeader ifHeader; private final String hrefPrefix; - private final String uriPrefix; private DavSession session; @@ -118,8 +117,8 @@ public class WebdavRequestImpl implement String host = getHeader("Host"); String scheme = getScheme(); - this.uriPrefix = scheme + "://" + host + getContextPath(); - this.hrefPrefix = createAbsoluteURI ? this.uriPrefix : getContextPath(); + String uriPrefix = scheme + "://" + host + getContextPath(); + this.hrefPrefix = createAbsoluteURI ? uriPrefix : getContextPath(); } /** @@ -165,7 +164,7 @@ public class WebdavRequestImpl implement if (path.startsWith(ctx)) { path = path.substring(ctx.length()); } - return factory.createResourceLocator(uriPrefix, path); + return factory.createResourceLocator(hrefPrefix, path); } /** @@ -221,7 +220,7 @@ public class WebdavRequestImpl implement throw new DavException(DavServletResponse.SC_FORBIDDEN); } } - return factory.createResourceLocator(uriPrefix, ref); + return factory.createResourceLocator(hrefPrefix, ref); } /** @@ -231,7 +230,7 @@ public class WebdavRequestImpl implement */ public DavResourceLocator getMemberLocator(String segment) { String path = (this.getRequestLocator().getHref(true) + segment).substring(hrefPrefix.length()); - return factory.createResourceLocator(uriPrefix, path); + return factory.createResourceLocator(hrefPrefix, path); } /**