Author: markt
Date: Thu Jan 10 13:20:06 2013
New Revision: 1431344
URL: http://svn.apache.org/viewvc?rev=1431344&view=rev
Log:
Fix resource leak that led to locked files.
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/AbstractResource.java
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/AbstractResource.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/AbstractResource.java?rev=1431344&r1=1431343&r2=1431344&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/webresources/AbstractResource.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/AbstractResource.java
Thu Jan 10 13:20:06 2013
@@ -104,14 +104,14 @@ public abstract class AbstractResource i
int size = (int) len;
byte[] result = new byte[size];
- InputStream is = getInputStream();
- if (is == null) {
- return null;
- }
int pos = 0;
- try {
+ try (InputStream is = getInputStream()) {
+ if (is == null) {
+ return null;
+ }
+
while (pos < size) {
int n = is.read(result, pos, size - pos);
if (n < 0) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
