svn commit: r1090834 - in /cxf/branches/2.3.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/jsonp/JsonpInInterceptor.java

[sergeyb]

Author: sergeyb
Date: Sun Apr 10 17:07:59 2011
New Revision: 1090834

URL: http://svn.apache.org/viewvc?rev=1090834&view=rev
Log:
Merged revisions 1090832 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1090832 | sergeyb | 2011-04-10 18:04:24 +0100 (Sun, 10 Apr 2011) | 1 line
  
  [CXF-3005] Minor update
........

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/jsonp/JsonpInInterceptor.java

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 10 17:07:59 2011
@@ -1 +1 @@
-/cxf/trunk:1090701
+/cxf/trunk:1090701,1090832

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

Modified: 
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/jsonp/JsonpInInterceptor.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/jsonp/JsonpInInterceptor.java?rev=1090834&r1=1090833&r2=1090834&view=diff
==============================================================================
--- 
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/jsonp/JsonpInInterceptor.java
 (original)
+++ 
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/jsonp/JsonpInInterceptor.java
 Sun Apr 10 17:07:59 2011
@@ -52,7 +52,7 @@ public class JsonpInInterceptor extends 
             if (getAcceptType() != null) {
                 // may be needed to enforce the selection of 
                 // JSON-awarenprovider
-                message.put(Message.CONTENT_TYPE, getAcceptType());
+                message.put(Message.ACCEPT_CONTENT_TYPE, getAcceptType());
             }
             message.getExchange().put(CALLBACK_KEY, callbackValue);
         }