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/05/05 20:52:48 UTC
svn commit: r1479358 - in /cxf/branches/2.7.x-fixes: ./
rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
Author: sergeyb
Date: Sun May 5 18:52:48 2013
New Revision: 1479358
URL: http://svn.apache.org/r1479358
Log:
Merged revisions 1479355 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1479355 | sergeyb | 2013-05-05 19:45:42 +0100 (Sun, 05 May 2013) | 1 line
Using Response.getMetadata to copy the headers
........
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:r1479355
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=1479358&r1=1479357&r2=1479358&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 Sun May 5 18:52:48 2013
@@ -1711,7 +1711,7 @@ public final class JAXRSUtils {
public static ResponseBuilder fromResponse(Response response) {
ResponseBuilder rb = toResponseBuilder(response.getStatus());
rb.entity(response.getEntity());
- for (Map.Entry<String, List<Object>> entry : response.getHeaders().entrySet()) {
+ for (Map.Entry<String, List<Object>> entry : response.getMetadata().entrySet()) {
List<Object> values = entry.getValue();
for (Object value : values) {
rb.header(entry.getKey(), value);
@@ -1732,7 +1732,7 @@ public final class JAXRSUtils {
ReflectionUtil.accessDeclaredField(f, response, Annotation[].class);
((ResponseImpl)r).setEntityAnnotations(fieldAnnotations);
} catch (Throwable ex) {
- LOG.warning("Custom annotations if any may can not be copied");
+ LOG.warning("Custom annotations if any can not be copied");
}
break;
}