You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2016/09/13 13:49:59 UTC
tomee git commit: TOMEE-1931 patch from Svetlin Zarev,
ensure to close inputstream for jaxrs resources without assuming the
inputstream impl, Fixes #38
Repository: tomee
Updated Branches:
refs/heads/master 00378f292 -> 7f9e30b0d
TOMEE-1931 patch from Svetlin Zarev, ensure to close inputstream for jaxrs resources without assuming the inputstream impl, Fixes #38
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/7f9e30b0
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/7f9e30b0
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/7f9e30b0
Branch: refs/heads/master
Commit: 7f9e30b0da45a99f9c2f6615d6ff3aacefbca2ab
Parents: 00378f2
Author: Romain manni-Bucau <rm...@gmail.com>
Authored: Tue Sep 13 15:49:52 2016 +0200
Committer: Romain manni-Bucau <rm...@gmail.com>
Committed: Tue Sep 13 15:49:52 2016 +0200
----------------------------------------------------------------------
.../org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/7f9e30b0/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
----------------------------------------------------------------------
diff --git a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
index 0e3d7de..e08ca05 100644
--- a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
+++ b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
@@ -313,6 +313,12 @@ public class CxfRsHttpListener implements RsHttpListener {
response.setStatus(HttpURLConnection.HTTP_OK);
} catch (final IOException ex) {
throw new ServletException("Static resource " + pathInfo + " can not be written to the output stream");
+ } finally {
+ try {
+ is.close();
+ } catch (final IOException e) {
+ // no-op
+ }
}
return true;
}