Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 32104 invoked from network); 23 Jun 2006 14:51:56 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 23 Jun 2006 14:51:56 -0000 Received: (qmail 44250 invoked by uid 500); 23 Jun 2006 14:51:17 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 43974 invoked by uid 500); 23 Jun 2006 14:51:13 -0000 Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@cocoon.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 43874 invoked by uid 99); 23 Jun 2006 14:51:11 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 Jun 2006 07:51:11 -0700 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 (asf.osuosl.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; Fri, 23 Jun 2006 07:32:24 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 091771A983A; Fri, 23 Jun 2006 07:32:04 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r416732 - /cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/classloader/WildcardMatcherHelper.java Date: Fri, 23 Jun 2006 14:32:03 -0000 To: cvs@cocoon.apache.org From: giacomo@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060623143204.091771A983A@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: giacomo Date: Fri Jun 23 07:32:03 2006 New Revision: 416732 URL: http://svn.apache.org/viewvc?rev=416732&view=rev Log: more fixes (why is this one duplicated here?) Modified: cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/classloader/WildcardMatcherHelper.java Modified: cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/classloader/WildcardMatcherHelper.java URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/classloader/WildcardMatcherHelper.java?rev=416732&r1=416731&r2=416732&view=diff ============================================================================== --- cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/classloader/WildcardMatcherHelper.java (original) +++ cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/classloader/WildcardMatcherHelper.java Fri Jun 23 07:32:03 2006 @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.cocoon.classloader; +package org.apache.cocoon.util; import java.util.HashMap; import java.util.Map; @@ -267,12 +267,14 @@ return checkEnds(sipat); } - // Now we need to check whether the litteral substring of the pattern - // is contained in the string somewhere - if(apat[ipat] != PATHSEP) { + // If we stopped at an other wildcard + // we exclude it from being compared + if(apat[ipat] == STAR) { ipat--; } + // Now we need to check whether the litteral substring of the pattern + // is contained in the string somewhere final int l = ipat- sipat + 1; final int sistr = istr; @@ -281,7 +283,7 @@ if(istr >= lstr) return false; add(new String(astr, sistr, istr - sistr)); - ipat += l; + ipat++; istr += l; }