cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r1291151 - in /cxf/branches/2.4.x-fixes: ./ rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSUtils.java
Date Mon, 20 Feb 2012 08:50:36 GMT
Author: ningjiang
Date: Mon Feb 20 08:50:35 2012
New Revision: 1291151

URL: http://svn.apache.org/viewvc?rev=1291151&view=rev
Log:
Merged revisions 1291149 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes

................
  r1291149 | ningjiang | 2012-02-20 16:45:15 +0800 (Mon, 20 Feb 2012) | 9 lines
  
  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.4.x-fixes/   (props changed)
    cxf/branches/2.4.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSUtils.java

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Feb 20 08:50:35 2012
@@ -0,0 +1,2 @@
+/cxf/branches/2.5.x-fixes:1291149
+/cxf/trunk:1291146

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.4.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSUtils.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSUtils.java?rev=1291151&r1=1291150&r2=1291151&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSUtils.java
(original)
+++ cxf/branches/2.4.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSUtils.java
Mon Feb 20 08:50:35 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) {



Mime
View raw message