Author: sergeyb
Date: Fri Aug 30 16:39:26 2013
New Revision: 1519020
URL: http://svn.apache.org/r1519020
Log:
Merged revisions 1519013 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1519013 | sergeyb | 2013-08-30 17:17:42 +0100 (Fri, 30 Aug 2013) | 1 line
One more update to do with updating InputStream
........
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/impl/ReaderInterceptorContextImpl.java
Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
Merged /cxf/trunk:r1519013
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/impl/ReaderInterceptorContextImpl.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ReaderInterceptorContextImpl.java?rev=1519020&r1=1519019&r2=1519020&view=diff
==============================================================================
---
cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ReaderInterceptorContextImpl.java
(original)
+++
cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ReaderInterceptorContextImpl.java
Fri Aug 30 16:39:26 2013
@@ -74,7 +74,7 @@ public class ReaderInterceptorContextImp
@Override
public void setInputStream(InputStream stream) {
is = stream;
- m.put(InputStream.class, stream);
+ m.setContent(InputStream.class, stream);
}