Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 61000 invoked from network); 3 Oct 2006 12:33:35 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 3 Oct 2006 12:33:35 -0000 Received: (qmail 70463 invoked by uid 500); 3 Oct 2006 12:33:35 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 70440 invoked by uid 500); 3 Oct 2006 12:33:35 -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 70431 invoked by uid 99); 3 Oct 2006 12:33:35 -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-SPF: pass (hermes.apache.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Oct 2006 05:33:34 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id C23CB1A981A; Tue, 3 Oct 2006 05:32:00 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r452453 - /jackrabbit/trunk/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/AbstractLocatorFactory.java Date: Tue, 03 Oct 2006 12:32:00 -0000 To: commits@jackrabbit.apache.org From: angela@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061003123200.C23CB1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: angela Date: Tue Oct 3 05:32:00 2006 New Revision: 452453 URL: http://svn.apache.org/viewvc?view=rev&rev=452453 Log: - handle null prefix - always remove trailing pathPrefix from href Modified: jackrabbit/trunk/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/AbstractLocatorFactory.java Modified: jackrabbit/trunk/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/AbstractLocatorFactory.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/AbstractLocatorFactory.java?view=diff&rev=452453&r1=452452&r2=452453 ============================================================================== --- jackrabbit/trunk/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/AbstractLocatorFactory.java (original) +++ jackrabbit/trunk/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/AbstractLocatorFactory.java Tue Oct 3 05:32:00 2006 @@ -96,8 +96,10 @@ href = href.substring(prefix.length()); } } - if (pathPrefix != null && pathPrefix.length() > 0 && !prefix.endsWith(pathPrefix)) { - b.append(pathPrefix); + if (pathPrefix != null && pathPrefix.length() > 0) { + if (!b.toString().endsWith(pathPrefix)) { + b.append(pathPrefix); + } if (href.startsWith(pathPrefix)) { href = href.substring(pathPrefix.length()); }