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/02 23:29:45 UTC
svn commit: r1509870 - in /cxf/branches/2.6.x-fixes: ./
rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
Author: sergeyb
Date: Fri Aug 2 21:29:44 2013
New Revision: 1509870
URL: http://svn.apache.org/r1509870
Log:
Merged revisions 1509868 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
................
r1509868 | sergeyb | 2013-08-02 22:24:57 +0100 (Fri, 02 Aug 2013) | 9 lines
Merged revisions 1509862 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1509862 | sergeyb | 2013-08-02 22:10:27 +0100 (Fri, 02 Aug 2013) | 1 line
If requested entity is InputStream do not close it even if auto-close is requested
........
................
Modified:
cxf/branches/2.6.x-fixes/ (props changed)
cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Merged /cxf/branches/2.7.x-fixes:r1509868
Merged /cxf/trunk:r1509862
Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java?rev=1509870&r1=1509869&r2=1509870&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java (original)
+++ cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java Fri Aug 2 21:29:44 2013
@@ -466,7 +466,8 @@ public abstract class AbstractClient imp
}
private boolean responseStreamCanBeClosed(Message outMessage, Class<?> cls) {
- return MessageUtils.isTrue(outMessage.getContextualProperty("response.stream.auto.close"));
+ return cls != InputStream.class
+ && MessageUtils.isTrue(outMessage.getContextualProperty("response.stream.auto.close"));
}
protected void completeExchange(Object response, Exchange exchange, boolean proxy) {