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 2014/07/24 15:57:24 UTC
[1/2] git commit: Updating Binary provider to keep the response input
stream opened if requested
Repository: cxf
Updated Branches:
refs/heads/master 67432aef1 -> eac181502
Updating Binary provider to keep the response input stream opened if requested
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c36df2aa
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c36df2aa
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c36df2aa
Branch: refs/heads/master
Commit: c36df2aab074a1c91af110cb2a91a0b1c9169773
Parents: 08d98fb
Author: Sergey Beryozkin <sb...@talend.com>
Authored: Thu Jul 24 16:56:23 2014 +0300
Committer: Sergey Beryozkin <sb...@talend.com>
Committed: Thu Jul 24 16:56:23 2014 +0300
----------------------------------------------------------------------
.../apache/cxf/jaxrs/provider/BinaryDataProvider.java | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/c36df2aa/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/BinaryDataProvider.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/BinaryDataProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/BinaryDataProvider.java
index 704ec8e..48bf561 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/BinaryDataProvider.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/BinaryDataProvider.java
@@ -59,7 +59,7 @@ public class BinaryDataProvider<T> extends AbstractConfigurableProvider
private static final int BUFFER_SIZE = 4096;
private boolean reportByteArraySize;
-
+ private boolean closeResponseInputStream;
public boolean isReadable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mt) {
return byte[].class.isAssignableFrom(type)
|| InputStream.class.isAssignableFrom(type)
@@ -161,7 +161,11 @@ public class BinaryDataProvider<T> extends AbstractConfigurableProvider
Message inMessage = PhaseInterceptorChain.getCurrentMessage().getExchange().getInMessage();
handleRangeRequest(is, os, new HttpHeadersImpl(inMessage), outHeaders);
} else {
- IOUtils.copyAndCloseInput(is, os);
+ if (closeResponseInputStream) {
+ IOUtils.copyAndCloseInput(is, os);
+ } else {
+ IOUtils.copy(is, os);
+ }
}
}
@@ -190,4 +194,8 @@ public class BinaryDataProvider<T> extends AbstractConfigurableProvider
public void setReportByteArraySize(boolean report) {
this.reportByteArraySize = report;
}
+
+ public void setCloseResponseInputStream(boolean closeResponseInputStream) {
+ this.closeResponseInputStream = closeResponseInputStream;
+ }
}
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/cxf
Posted by se...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/eac18150
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/eac18150
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/eac18150
Branch: refs/heads/master
Commit: eac181502bc46ae185b92da2c64ca27a7912bc35
Parents: c36df2a 67432ae
Author: Sergey Beryozkin <sb...@talend.com>
Authored: Thu Jul 24 16:57:04 2014 +0300
Committer: Sergey Beryozkin <sb...@talend.com>
Committed: Thu Jul 24 16:57:04 2014 +0300
----------------------------------------------------------------------
distribution/manifest/pom.xml | 5 +-
distribution/pom.xml | 6 +-
parent/pom.xml | 54 +--
rt/databinding/jaxb/pom.xml | 19 -
rt/databinding/xmlbeans/pom.xml | 12 -
rt/frontend/jaxws/pom.xml | 251 +----------
.../org/apache/cxf/jaxws22/EndpointImpl.java | 116 ++++++
.../org/apache/cxf/jaxws22/JAXWS22Invoker.java | 43 ++
.../apache/cxf/jaxws22/spi/ProviderImpl.java | 76 ++++
.../spring/JAXWS22SpringEndpointImpl.java | 56 +++
.../http_jaxws_spi/HttpHandlerImpl.java | 71 ++++
.../HttpServletRequestAdapter.java | 414 +++++++++++++++++++
.../HttpServletResponseAdapter.java | 245 +++++++++++
.../http_jaxws_spi/JAXWSHttpSpiDestination.java | 123 ++++++
.../JAXWSHttpSpiTransportFactory.java | 52 +++
.../org/apache/cxf/jaxws22/EndpointImpl.java | 116 ------
.../org/apache/cxf/jaxws22/JAXWS22Invoker.java | 43 --
.../apache/cxf/jaxws22/spi/ProviderImpl.java | 76 ----
.../spring/JAXWS22SpringEndpointImpl.java | 56 ---
.../http_jaxws_spi/HttpHandlerImpl.java | 71 ----
.../HttpServletRequestAdapter.java | 414 -------------------
.../HttpServletResponseAdapter.java | 245 -----------
.../http_jaxws_spi/JAXWSHttpSpiDestination.java | 123 ------
.../JAXWSHttpSpiTransportFactory.java | 52 ---
.../META-INF/services/javax.xml.ws.spi.Provider | 1 +
.../META-INF/services/javax.xml.ws.spi.Provider | 1 -
rt/rs/security/cors/pom.xml | 5 -
systests/container-integration/pom.xml | 9 +-
systests/ws-rm/pom.xml | 55 ---
systests/ws-security-examples/pom.xml | 10 -
systests/ws-security/pom.xml | 10 -
systests/ws-specs/pom.xml | 73 ----
.../cxf/systest/ws/addr_responses/Hello.java | 31 ++
.../systest/ws/addr_responses/HelloImpl.java | 34 ++
.../systest/ws/addr_responses/HelloService.java | 43 ++
.../cxf/systest/ws/addr_responses/Server.java | 58 +++
.../WSAResponsesClientServerTest.java | 66 +++
.../cxf/systest/ws/addr_responses/Hello.java | 31 --
.../systest/ws/addr_responses/HelloImpl.java | 34 --
.../systest/ws/addr_responses/HelloService.java | 43 --
.../cxf/systest/ws/addr_responses/Server.java | 58 ---
.../WSAResponsesClientServerTest.java | 66 ---
42 files changed, 1437 insertions(+), 1930 deletions(-)
----------------------------------------------------------------------