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:45:42 UTC
svn commit: r1479355 -
/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
Author: sergeyb
Date: Sun May 5 18:45:42 2013
New Revision: 1479355
URL: http://svn.apache.org/r1479355
Log:
Using Response.getMetadata to copy the headers
Modified:
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java?rev=1479355&r1=1479354&r2=1479355&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java Sun May 5 18:45:42 2013
@@ -1759,7 +1759,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);
@@ -1780,7 +1780,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;
}