Author: dkulp
Date: Thu Nov 8 15:21:24 2012
New Revision: 1407123
URL: http://svn.apache.org/viewvc?rev=1407123&view=rev
Log:
Merged revisions 1406847 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1406847 | dkulp | 2012-11-07 17:26:51 -0500 (Wed, 07 Nov 2012) | 3 lines
[CXF-4618] CLose input stream after done copying
Patch from Steve Hodecker applied
........
Modified:
cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/DataSourceProvider.java
Modified:
cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/DataSourceProvider.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/DataSourceProvider.java?rev=1407123&r1=1407122&r2=1407123&view=diff
==============================================================================
---
cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/DataSourceProvider.java
(original)
+++
cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/DataSourceProvider.java
Thu Nov 8 15:21:24 2012
@@ -76,7 +76,7 @@ public class DataSourceProvider<T> imple
if (useDataSourceContentType) {
setContentTypeIfNeeded(type, headers, ds.getContentType());
}
- IOUtils.copy(ds.getInputStream(), os);
+ IOUtils.copyAndCloseInput(ds.getInputStream(), os);
}
private void setContentTypeIfNeeded(MediaType type,
