Author: dkulp Date: Thu Nov 8 15:49:46 2012 New Revision: 1407136 URL: http://svn.apache.org/viewvc?rev=1407136&view=rev Log: Merged revisions 1407123 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........ r1407123 | dkulp | 2012-11-08 10:21:24 -0500 (Thu, 08 Nov 2012) | 11 lines 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.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/DataSourceProvider.java Modified: cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/DataSourceProvider.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/DataSourceProvider.java?rev=1407136&r1=1407135&r2=1407136&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/DataSourceProvider.java (original) +++ cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/DataSourceProvider.java Thu Nov 8 15:49:46 2012 @@ -75,7 +75,7 @@ public class DataSourceProvider implemen if (useDataSourceContentType) { setContentTypeIfNeeded(type, headers, ds.getContentType()); } - IOUtils.copy(ds.getInputStream(), os); + IOUtils.copyAndCloseInput(ds.getInputStream(), os); } @SuppressWarnings("unchecked")
