Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 38949 invoked from network); 6 Dec 2010 10:58:35 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 6 Dec 2010 10:58:35 -0000 Received: (qmail 96881 invoked by uid 500); 6 Dec 2010 10:58:35 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 96768 invoked by uid 500); 6 Dec 2010 10:58:34 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 96761 invoked by uid 99); 6 Dec 2010 10:58:34 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Dec 2010 10:58:34 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Mon, 06 Dec 2010 10:58:33 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 27DDD23889E3; Mon, 6 Dec 2010 10:58:13 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1042571 - /cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/URITemplate.java Date: Mon, 06 Dec 2010 10:58:13 -0000 To: commits@cxf.apache.org From: sergeyb@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101206105813.27DDD23889E3@eris.apache.org> Author: sergeyb Date: Mon Dec 6 10:58:12 2010 New Revision: 1042571 URL: http://svn.apache.org/viewvc?rev=1042571&view=rev Log: [CXF-3166] Ignoring all empty values but the last one Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/URITemplate.java Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/URITemplate.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/URITemplate.java?rev=1042571&r1=1042570&r2=1042571&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/URITemplate.java (original) +++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/URITemplate.java Mon Dec 6 10:58:12 2010 @@ -174,7 +174,7 @@ public final class URITemplate { for (String name : variables) { while (i <= groupCount) { String value = m.group(i++); - if (value == null || value.length() == 0) { + if (value == null || value.length() == 0 && i < groupCount) { continue; } templateVariableToValue.add(name, value);