svn commit: r648348 - in /incubator/cxf/trunk/rt/frontend/jaxrs: pom.xml src/main/java/org/apache/cxf/jaxrs/provider/FormEncodingReaderProvider.java

[dkulp]

Author: dkulp
Date: Tue Apr 15 10:30:06 2008
New Revision: 648348

URL: http://svn.apache.org/viewvc?rev=648348&view=rev
Log:
[CXF-1527] Patch from Barry Fitzgerald applied
Also exclude the old version of annotation jar to avoid duplicates in the 
distribution

Modified:
    incubator/cxf/trunk/rt/frontend/jaxrs/pom.xml
    
incubator/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/FormEncodingReaderProvider.java

Modified: incubator/cxf/trunk/rt/frontend/jaxrs/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxrs/pom.xml?rev=648348&r1=648347&r2=648348&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxrs/pom.xml (original)
+++ incubator/cxf/trunk/rt/frontend/jaxrs/pom.xml Tue Apr 15 10:30:06 2008
@@ -95,6 +95,10 @@
                     <groupId>org.apache.abdera</groupId>
                     <artifactId>abdera-client</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-activation_1.0.2_spec</artifactId>
+                </exclusion>
             </exclusions>
         </dependency> 
         <dependency>

Modified: 
incubator/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/FormEncodingReaderProvider.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/FormEncodingReaderProvider.java?rev=648348&r1=648347&r2=648348&view=diff
==============================================================================
--- 
incubator/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/FormEncodingReaderProvider.java
 (original)
+++ 
incubator/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/FormEncodingReaderProvider.java
 Tue Apr 15 10:30:06 2008
@@ -76,7 +76,7 @@
 
     /**
      * Retrieve map of parameters from the passed in message
-     * 
+     *
      * @param message
      * @return a Map of parameters.
      */
@@ -86,7 +86,12 @@
             List<String> parts = Arrays.asList(body.split("&"));
             for (String part : parts) {
                 String[] keyValue = part.split("=");
-                params.add(keyValue[0], keyValue[1]);
+                // Change to add blank string if key but not value is specified
+                if (keyValue.length == 2) {
+                    params.add(keyValue[0], keyValue[1]);
+                } else {
+                    params.add(keyValue[0], "");
+                }
             }
         }
         return params;