svn commit: r675988 - /cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java

[sergeyb]

Author: sergeyb
Date: Fri Jul 11 08:28:33 2008
New Revision: 675988

URL: http://svn.apache.org/viewvc?rev=675988&view=rev
Log:
CXF-1699 : applying patch on behalf of Brad Moody, thanks

Modified:
    
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java

Modified: 
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java?rev=675988&r1=675987&r2=675988&view=diff
==============================================================================
--- 
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java
 (original)
+++ 
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java
 Fri Jul 11 08:28:33 2008
@@ -146,6 +146,11 @@
             }
             
             try {
+                
+                responseType = checkFinalContentType(responseType);
+                LOG.fine("Response content type is: " + 
responseType.toString());
+                message.put(Message.CONTENT_TYPE, responseType.toString());
+                
                 LOG.fine("Response EntityProvider is: " + 
writer.getClass().getName());
                 writer.writeTo(responseObj, targetType, 
invoked.getGenericReturnType(), 
                                invoked.getAnnotations(), 
@@ -153,11 +158,6 @@
                                response.getMetadata(), 
                                out);
                 
-                responseType = checkFinalContentType(responseType);
-                LOG.fine("Response content type is: " + 
responseType.toString());
-                message.put(Message.CONTENT_TYPE, responseType.toString());
-                
-                
             } catch (IOException e) {
                 e.printStackTrace();
                 message.put(Message.RESPONSE_CODE, 500);