svn commit: r1042577 - in /cxf/branches/2.3.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/URITemplate.java

[sergeyb]

Author: sergeyb
Date: Mon Dec  6 11:05:55 2010
New Revision: 1042577

URL: http://svn.apache.org/viewvc?rev=1042577&view=rev
Log:
Merged revisions 1042571 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1042571 | sergeyb | 2010-12-06 10:58:12 +0000 (Mon, 06 Dec 2010) | 1 line
  
  [CXF-3166] Ignoring all empty values but the last one
........

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/URITemplate.java

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec  6 11:05:55 2010
@@ -1 +1 @@
-/cxf/trunk:1041183,1041790,1041993,1042346
+/cxf/trunk:1041183,1041790,1041993,1042346,1042571

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/URITemplate.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/URITemplate.java?rev=1042577&r1=1042576&r2=1042577&view=diff
==============================================================================
--- 
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/URITemplate.java
 (original)
+++ 
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/URITemplate.java
 Mon Dec  6 11:05:55 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);