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/08/30 14:34:11 UTC
svn commit: r1518956 - in /cxf/branches/2.7.x-fixes: ./
rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientRequestContextImpl.java
rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientResponseContextImpl.java
Author: sergeyb
Date: Fri Aug 30 12:34:10 2013
New Revision: 1518956
URL: http://svn.apache.org/r1518956
Log:
Merged revisions 1518954 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1518954 | sergeyb | 2013-08-30 13:30:32 +0100 (Fri, 30 Aug 2013) | 1 line
Also fixing client contexts to deal with streams
........
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/client/spec/ClientRequestContextImpl.java
cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientResponseContextImpl.java
Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
Merged /cxf/trunk:r1518954
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/client/spec/ClientRequestContextImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientRequestContextImpl.java?rev=1518956&r1=1518955&r2=1518956&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientRequestContextImpl.java (original)
+++ cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientRequestContextImpl.java Fri Aug 30 12:34:10 2013
@@ -93,7 +93,7 @@ public class ClientRequestContextImpl ex
@Override
public OutputStream getEntityStream() {
- return m.get(OutputStream.class);
+ return m.getContent(OutputStream.class);
}
@Override
@@ -140,7 +140,7 @@ public class ClientRequestContextImpl ex
@Override
public void setEntityStream(OutputStream os) {
- m.put(OutputStream.class, os);
+ m.setContent(OutputStream.class, os);
}
Modified: cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientResponseContextImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientResponseContextImpl.java?rev=1518956&r1=1518955&r2=1518956&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientResponseContextImpl.java (original)
+++ cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientResponseContextImpl.java Fri Aug 30 12:34:10 2013
@@ -39,7 +39,7 @@ public class ClientResponseContextImpl e
}
public InputStream getEntityStream() {
- return m.get(InputStream.class);
+ return m.getContent(InputStream.class);
}
@SuppressWarnings("unchecked")
@@ -55,7 +55,7 @@ public class ClientResponseContextImpl e
@Override
public void setEntityStream(InputStream is) {
- m.put(InputStream.class, is);
+ m.setContent(InputStream.class, is);
}
}