[patch] always close istream in DefaultServlet#copy

0001-Always-close-istream-even-when-an-exception-is-throw.patch (text/plain), 2.33 KB, created by Felix Schumacher on 2014-08-31 10:38:31 UTC

(hide)

Description: always close istream in DefaultServlet#copy

Filename:

MIME Type:

Creator: Felix Schumacher

Created: 2014-08-31 10:38:31 UTC

Size: 2.33 KB

patch

obsolete

>From 84b7e92c8e4247533fed61353bb9d9f1145c5bfb Mon Sep 17 00:00:00 2001 >From: Felix Schumacher <felix.schumacher@internetallee.de> >Date: Sun, 31 Aug 2014 12:29:22 +0200 >Subject: [PATCH] Always close istream, even when an exception is thrown while > writing to ostream. > >--- > .../apache/catalina/servlets/DefaultServlet.java | 36 ++++++++++++---------- > 1 file changed, 19 insertions(+), 17 deletions(-) > >diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java b/java/org/apache/catalina/servlets/DefaultServlet.java >index a88f17d..584bff6 100644 >--- a/java/org/apache/catalina/servlets/DefaultServlet.java >+++ b/java/org/apache/catalina/servlets/DefaultServlet.java >@@ -2035,23 +2035,25 @@ public class DefaultServlet extends HttpServlet { > InputStream istream = > new BufferedInputStream(resourceInputStream, input); > >- Range currentRange = ranges.next(); >- >- // Writing MIME header. >- ostream.println(); >- ostream.println("--" + mimeSeparation); >- if (contentType != null) >- ostream.println("Content-Type: " + contentType); >- ostream.println("Content-Range: bytes " + currentRange.start >- + "-" + currentRange.end + "/" >- + currentRange.length); >- ostream.println(); >- >- // Printing content >- exception = copyRange(istream, ostream, currentRange.start, >- currentRange.end); >- >- istream.close(); >+ try { >+ Range currentRange = ranges.next(); >+ >+ // Writing MIME header. >+ ostream.println(); >+ ostream.println("--" + mimeSeparation); >+ if (contentType != null) >+ ostream.println("Content-Type: " + contentType); >+ ostream.println("Content-Range: bytes " + currentRange.start >+ + "-" + currentRange.end + "/" >+ + currentRange.length); >+ ostream.println(); >+ >+ // Printing content >+ exception = copyRange(istream, ostream, currentRange.start, >+ currentRange.end); >+ } finally { >+ istream.close(); >+ } > > } > >-- >1.9.1 > View Attachment As Diff View Attachment As Raw

This is ASF Bugzilla: the Apache Software Foundation bug system. In case of problems with the functioning of ASF Bugzilla, please contact bugzilla-admin@apache.org. Please Note: this e-mail address is only for reporting problems with ASF Bugzilla. Mail about any other subject will be silently ignored.

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    Remember [x]
  • | Forgot Password
    Login: [x]