Author: ffang Date: Wed Feb 22 01:21:55 2012 New Revision: 1292104 URL: http://svn.apache.org/viewvc?rev=1292104&view=rev Log: Merged revisions 1292101 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.4.x-fixes
................ r1292101 | ffang | 2012-02-22 09:05:13 +0800 (三, 22 2 2012) | 9 lines Merged revisions 1292095 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes ........ r1292095 | ffang | 2012-02-22 08:46:39 +0800 (三, 22 2 2012) | 1 line make checkstyle happy ........ ................ Modified: cxf/branches/2.3.x-fixes/ (props changed) cxf/branches/2.3.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSUtils.java Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.3.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSUtils.java URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSUtils.java?rev=1292104&r1=1292103&r2=1292104&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSUtils.java (original) +++ cxf/branches/2.3.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSUtils.java Wed Feb 22 01:21:55 2012 @@ -428,8 +428,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&& - !contentType.toLowerCase().contains("multipart/related")) { + if (enc != null && contentType.indexOf("charset=") == -1 + && !contentType.toLowerCase().contains("multipart/related")) { contentType = contentType + "; charset=" + enc; } } else if (enc != null) {
