You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2011/12/21 00:23:26 UTC
svn commit: r1221520 - in /cxf/branches/2.4.x-fixes: ./
rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/
systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/
Author: sergeyb
Date: Tue Dec 20 23:23:25 2011
New Revision: 1221520
URL: http://svn.apache.org/viewvc?rev=1221520&view=rev
Log:
Merged revisions 1221519 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1221519 | sergeyb | 2011-12-20 23:19:17 +0000 (Tue, 20 Dec 2011) | 1 line
[CXF-3987] Checking Content-Id in case of missing Content-Disposition
........
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/FormUtils.java
cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java
cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/MultipartStore.java
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 20 23:23:25 2011
@@ -1 +1 @@
-/cxf/trunk:1221204,1221208,1221221,1221226,1221511
+/cxf/trunk:1221204,1221208,1221221,1221226,1221511,1221519
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/FormUtils.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/FormUtils.java?rev=1221520&r1=1221519&r2=1221520&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/FormUtils.java (original)
+++ cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/FormUtils.java Tue Dec 20 23:23:25 2011
@@ -143,10 +143,10 @@ public final class FormUtils {
List<Attachment> atts = body.getAllAttachments();
for (Attachment a : atts) {
ContentDisposition cd = a.getContentDisposition();
- if (cd == null || !MULTIPART_FORM_DATA_TYPE.equalsIgnoreCase(cd.getType())) {
+ if (cd != null && !MULTIPART_FORM_DATA_TYPE.equalsIgnoreCase(cd.getType())) {
continue;
}
- String cdName = cd.getParameter("name");
+ String cdName = cd == null ? null : cd.getParameter("name");
String contentId = a.getContentId();
String name = StringUtils.isEmpty(cdName) ? contentId : cdName.replace("\"", "").replace("'", "");
if (StringUtils.isEmpty(name)) {
Modified: cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java?rev=1221520&r1=1221519&r2=1221520&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java (original)
+++ cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java Tue Dec 20 23:23:25 2011
@@ -336,8 +336,18 @@ public class JAXRSMultipartTest extends
}
@Test
- public void testNullableParams() throws Exception {
+ public void testNullableParamsMultipartAnnotation() throws Exception {
String address = "http://localhost:" + PORT + "/bookstore/books/testnullpart";
+ doTestNullPart(address);
+ }
+
+ @Test
+ public void testNullableParamsFormParamAnnotation() throws Exception {
+ String address = "http://localhost:" + PORT + "/bookstore/books/testnullpartFormParam";
+ doTestNullPart(address);
+ }
+
+ private void doTestNullPart(String address) throws Exception {
WebClient client = WebClient.create(address);
WebClient.getConfig(client).getHttpConduit().getClient().setReceiveTimeout(10000000);
client.type("multipart/form-data").accept("text/plain");
Modified: cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/MultipartStore.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/MultipartStore.java?rev=1221520&r1=1221519&r2=1221520&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/MultipartStore.java (original)
+++ cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/MultipartStore.java Tue Dec 20 23:23:25 2011
@@ -156,6 +156,15 @@ public class MultipartStore {
}
@POST
+ @Path("/books/testnullpartFormParam")
+ @Consumes("multipart/form-data")
+ @Produces("text/plain")
+ public String testNullPartFormParam(@FormParam(value = "someid") String value) {
+ return testNullPart(value);
+ }
+
+
+ @POST
@Path("/books/jaxbjsonimage")
@Consumes("multipart/mixed")
@Produces("multipart/mixed")