You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2013/12/19 18:24:53 UTC
svn commit: r1552364 - in /cxf/branches/2.7.x-fixes: ./
rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/jsonp/
rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/jsonp/
Author: sergeyb
Date: Thu Dec 19 17:24:53 2013
New Revision: 1552364
URL: http://svn.apache.org/r1552364
Log:
Merged revisions 1552357 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1552357 | sergeyb | 2013-12-19 17:15:38 +0000 (Thu, 19 Dec 2013) | 1 line
[CXF-5469] Fixing a typo on JsonpInInterceptor
........
Modified:
cxf/branches/2.7.x-fixes/ (props changed)
cxf/branches/2.7.x-fixes/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/jsonp/JsonpInInterceptor.java
cxf/branches/2.7.x-fixes/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/jsonp/JsonpInterceptorTest.java
Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
svn:mergeinfo = /cxf/trunk:1552357
Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.7.x-fixes/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/jsonp/JsonpInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/jsonp/JsonpInInterceptor.java?rev=1552364&r1=1552363&r2=1552364&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/jsonp/JsonpInInterceptor.java (original)
+++ cxf/branches/2.7.x-fixes/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/jsonp/JsonpInInterceptor.java Thu Dec 19 17:24:53 2013
@@ -63,7 +63,7 @@ public class JsonpInInterceptor extends
protected String getCallbackValue(Message message) {
String theQuery = (String)message.get(Message.QUERY_STRING);
- String callback = JAXRSUtils.getStructuredParams(theQuery, "&", false, false).getFirst(CALLBACK_KEY);
+ String callback = JAXRSUtils.getStructuredParams(theQuery, "&", false, false).getFirst(CALLBACK_PARAM);
if (StringUtils.isEmpty(callback)) {
String httpAcceptType = (String)message.get(Message.ACCEPT_CONTENT_TYPE);
if (httpAcceptType != null && mediaType.equals(httpAcceptType)) {
Modified: cxf/branches/2.7.x-fixes/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/jsonp/JsonpInterceptorTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/jsonp/JsonpInterceptorTest.java?rev=1552364&r1=1552363&r2=1552364&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/jsonp/JsonpInterceptorTest.java (original)
+++ cxf/branches/2.7.x-fixes/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/jsonp/JsonpInterceptorTest.java Thu Dec 19 17:24:53 2013
@@ -53,7 +53,7 @@ public class JsonpInterceptorTest extend
Message message = new MessageImpl();
message.put(Message.CONTENT_TYPE, MediaType.APPLICATION_JSON);
message.setExchange(new ExchangeImpl());
- message.put(Message.QUERY_STRING, JsonpInInterceptor.CALLBACK_KEY + "=" + "myCallback");
+ message.put(Message.QUERY_STRING, JsonpInInterceptor.CALLBACK_PARAM + "=" + "myCallback");
ByteArrayOutputStream bos = new ByteArrayOutputStream();
message.setContent(OutputStream.class, bos);