You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@cxf.apache.org by GitBox <gi...@apache.org> on 2018/06/05 12:48:26 UTC

[GitHub] deki closed pull request #408: [CXF-7317] Non-URL encoded Content-Id href does not seem be serialized by CXF's AttachmentSerializer

deki closed pull request #408: [CXF-7317] Non-URL encoded Content-Id href does not seem be serialized by CXF's AttachmentSerializer
URL: https://github.com/apache/cxf/pull/408
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/core/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java b/core/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java
index df94235483a..3a86c406c5f 100644
--- a/core/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java
+++ b/core/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java
@@ -24,7 +24,6 @@
 import java.io.OutputStream;
 import java.io.StringWriter;
 import java.io.Writer;
-import java.net.URLDecoder;
 import java.nio.charset.StandardCharsets;
 import java.util.Collections;
 import java.util.Iterator;
@@ -215,7 +214,7 @@ private void writeHeaders(String contentType, String attachmentId,
         if (attachmentId != null) {
             attachmentId = checkAngleBrackets(attachmentId);
             writer.write("Content-ID: <");
-            writer.write(URLDecoder.decode(attachmentId, StandardCharsets.UTF_8.name()));
+            writer.write(attachmentId);
             writer.write(">\r\n");
         }
         // headers like Content-Disposition need to be serialized


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services