You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2017/10/03 14:59:34 UTC
[cxf] 03/03: Fixing merge
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.0.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 29c1740b4bacc63ed1216e7bed504deff07dd1bf
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Oct 3 15:59:18 2017 +0100
Fixing merge
---
core/src/main/java/org/apache/cxf/attachment/ContentDisposition.java | 2 +-
.../src/main/java/org/apache/cxf/jaxrs/ext/multipart/Attachment.java | 5 -----
.../test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java | 4 ++--
3 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/core/src/main/java/org/apache/cxf/attachment/ContentDisposition.java b/core/src/main/java/org/apache/cxf/attachment/ContentDisposition.java
index 4b15771..80dcdfa 100644
--- a/core/src/main/java/org/apache/cxf/attachment/ContentDisposition.java
+++ b/core/src/main/java/org/apache/cxf/attachment/ContentDisposition.java
@@ -28,7 +28,7 @@ import java.util.regex.Pattern;
public class ContentDisposition {
private static final String CD_HEADER_PARAMS_EXPRESSION =
- "[\\w-]++( )?\\*?=( )?((\"[^\"]++\")|([^;]+))";
+ "[\\w-]++( )?\\*?=( )?((\"[^\"]++\")|([^;]+))";
private static final Pattern CD_HEADER_PARAMS_PATTERN =
Pattern.compile(CD_HEADER_PARAMS_EXPRESSION);
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/Attachment.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/Attachment.java
index 4dafe15..a76deae 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/Attachment.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/Attachment.java
@@ -121,12 +121,7 @@ public class Attachment implements Transferable {
}
public MediaType getContentType() {
-<<<<<<< HEAD
String value = handler != null ? handler.getContentType() : headers.getFirst("Content-Type");
-=======
- String value = handler != null && handler.getContentType() != null ? handler.getContentType()
- : headers.getFirst("Content-Type");
->>>>>>> 896bd961cb... CXF-7507 - Put a configurable limit on the size of attachment headers
return value == null ? MediaType.TEXT_PLAIN_TYPE : JAXRSUtils.toMediaType(value);
}
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java
index 7fa7b70..e652fb2 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java
@@ -961,7 +961,7 @@ public class JAXRSMultipartTest extends AbstractBusClientServerTestBase {
sb.append("aaaaaaaaaa");
}
- MultivaluedMap<String, String> headers = new MultivaluedHashMap<>();
+ MultivaluedMap<String, String> headers = new MultivaluedHashMap<String, String>();
headers.putSingle("Content-ID", "root");
headers.putSingle("Content-Type", "application/octet-stream");
headers.putSingle("Content-Disposition", sb.toString());
@@ -992,7 +992,7 @@ public class JAXRSMultipartTest extends AbstractBusClientServerTestBase {
sb.append("aaaaaaaaaa");
}
- MultivaluedMap<String, String> headers = new MultivaluedHashMap<>();
+ MultivaluedMap<String, String> headers = new MultivaluedHashMap<String, String>();
headers.putSingle("Content-ID", "root");
headers.putSingle("Content-Type", "application/octet-stream");
headers.putSingle("Content-Disposition", sb.toString());
--
To stop receiving notification emails like this one, please contact
"commits@cxf.apache.org" <co...@cxf.apache.org>.