cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1542249 - in /cxf/branches/2.7.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
Date Fri, 15 Nov 2013 12:39:09 GMT
Author: sergeyb
Date: Fri Nov 15 12:39:09 2013
New Revision: 1542249

URL: http://svn.apache.org/r1542249
Log:
Merged revisions 1542247 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1542247 | sergeyb | 2013-11-15 12:36:37 +0000 (Fri, 15 Nov 2013) | 1 line
  
  [CXF-5385] Updating JAXRSUtils to use JAX-RS 1.1 Response.getMetadata instead of 2.0 Response.getHeaders
........

Modified:
    cxf/branches/2.7.x-fixes/   (props changed)
    cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java

Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
  Merged /cxf/trunk:r1542247

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

Modified: cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java?rev=1542249&r1=1542248&r2=1542249&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
(original)
+++ cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
Fri Nov 15 12:39:09 2013
@@ -1584,7 +1584,7 @@ public final class JAXRSUtils {
     
     public static void setMessageContentType(Message message, Response response) {
         if (response != null) {
-            Object ct = response.getHeaders().getFirst(HttpHeaders.CONTENT_TYPE);
+            Object ct = response.getMetadata().getFirst(HttpHeaders.CONTENT_TYPE);
             if (ct != null) {
                 Exchange ex = message.getExchange();
                 if (ex.getInMessage() == message) {



Mime
View raw message