Author: ningjiang
Date: Mon Feb 20 08:45:15 2012
New Revision: 1291149
URL: http://svn.apache.org/viewvc?rev=1291149&view=rev
Log:
Merged revisions 1291146 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1291146 | ningjiang | 2012-02-20 16:34:34 +0800 (Mon, 20 Feb 2012) | 1 line
CXF-4120 JMS Transport content-type setting should be consistent with the
HTTP one
........
Modified:
cxf/branches/2.5.x-fixes/ (props changed)
cxf/branches/2.5.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSUtils.java
Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 20 08:45:15 2012
@@ -1 +1 @@
-/cxf/trunk:1244697,1244821,1244939,1245070,1245572,1245591
+/cxf/trunk:1244697,1244821,1244939,1245070,1245572,1245591,1291146
Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.5.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSUtils.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSUtils.java?rev=1291149&r1=1291148&r2=1291149&view=diff
==============================================================================
---
cxf/branches/2.5.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSUtils.java
(original)
+++
cxf/branches/2.5.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSUtils.java
Mon Feb 20 08:45:15 2012
@@ -393,7 +393,8 @@ public final class JMSUtils {
String enc =
(String)message.get(org.apache.cxf.message.Message.ENCODING);
// add the encoding information
if (null != contentType) {
- if (enc != null && contentType.indexOf("charset=") == -1) {
+ if (enc != null && contentType.indexOf("charset=") == -1
+ && !contentType.toLowerCase().contains("multipart/related")) {
contentType = contentType + "; charset=" + enc;
}
} else if (enc != null) {
@@ -428,7 +429,8 @@ public final class JMSUtils {
String enc =
(String)message.get(org.apache.cxf.message.Message.ENCODING);
// add the encoding information
if (null != contentType) {
- if (enc != null && contentType.indexOf("charset=") == -1) {
+ if (enc != null && contentType.indexOf("charset=") == -1&&
+ !contentType.toLowerCase().contains("multipart/related")) {
contentType = contentType + "; charset=" + enc;
}
} else if (enc != null) {
