You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2011/01/10 23:05:59 UTC
svn commit: r1057392 - in /cxf/branches/2.3.x-fixes: ./
rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
Author: dkulp
Date: Mon Jan 10 22:05:59 2011
New Revision: 1057392
URL: http://svn.apache.org/viewvc?rev=1057392&view=rev
Log:
Merged revisions 1057390 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1057390 | dkulp | 2011-01-10 17:02:25 -0500 (Mon, 10 Jan 2011) | 1 line
[CXF-3232] Add a NPE guard around setting the content type
........
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java?rev=1057392&r1=1057391&r2=1057392&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java (original)
+++ cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java Mon Jan 10 22:05:59 2011
@@ -249,7 +249,7 @@ public abstract class AbstractHTTPDestin
Map<?, ?> headers = (Map<?, ?>)message.get(Message.PROTOCOL_HEADERS);
if (null != headers) {
- if (!headers.containsKey(Message.CONTENT_TYPE)) {
+ if (!headers.containsKey(Message.CONTENT_TYPE) && ct != null) {
response.setContentType(ct);
}