Author: violetagg
Date: Tue Dec 22 07:53:35 2015
New Revision: 1721314
URL: http://svn.apache.org/viewvc?rev=1721314&view=rev
Log:
Followup to r1721311
Modified:
tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java
tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
Modified: tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java?rev=1721314&r1=1721313&r2=1721314&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java Tue Dec
22 07:53:35 2015
@@ -243,7 +243,10 @@ public abstract class AbstractCatalinaTa
}
ostream.flush();
} finally {
- istream.close();
+ try {
+ istream.close();
+ } catch (Exception e) {
+ }
}
}
Modified: tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=1721314&r1=1721313&r2=1721314&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java Tue Dec
22 07:53:35 2015
@@ -562,38 +562,38 @@ public class DefaultServlet extends Http
contentFile.deleteOnExit();
}
- RandomAccessFile randAccessContentFile =
- new RandomAccessFile(contentFile, "rw");
+ try (RandomAccessFile randAccessContentFile =
+ new RandomAccessFile(contentFile, "rw");) {
- WebResource oldResource = resources.getResource(path);
+ WebResource oldResource = resources.getResource(path);
- // Copy data in oldRevisionContent to contentFile
- if (oldResource.isFile()) {
- try (BufferedInputStream bufOldRevStream =
- new BufferedInputStream(oldResource.getInputStream(),
- BUFFER_SIZE);) {
-
- int numBytesRead;
- byte[] copyBuffer = new byte[BUFFER_SIZE];
- while ((numBytesRead = bufOldRevStream.read(copyBuffer)) !=
-1) {
- randAccessContentFile.write(copyBuffer, 0, numBytesRead);
- }
+ // Copy data in oldRevisionContent to contentFile
+ if (oldResource.isFile()) {
+ try (BufferedInputStream bufOldRevStream =
+ new BufferedInputStream(oldResource.getInputStream(),
+ BUFFER_SIZE);) {
+
+ int numBytesRead;
+ byte[] copyBuffer = new byte[BUFFER_SIZE];
+ while ((numBytesRead = bufOldRevStream.read(copyBuffer))
!= -1) {
+ randAccessContentFile.write(copyBuffer, 0,
numBytesRead);
+ }
+ }
}
- }
- randAccessContentFile.setLength(range.length);
+ randAccessContentFile.setLength(range.length);
- // Append data in request input stream to contentFile
- randAccessContentFile.seek(range.start);
- int numBytesRead;
- byte[] transferBuffer = new byte[BUFFER_SIZE];
- try (BufferedInputStream requestBufInStream =
- new BufferedInputStream(req.getInputStream(), BUFFER_SIZE);) {
- while ((numBytesRead = requestBufInStream.read(transferBuffer)) !=
-1) {
- randAccessContentFile.write(transferBuffer, 0, numBytesRead);
+ // Append data in request input stream to contentFile
+ randAccessContentFile.seek(range.start);
+ int numBytesRead;
+ byte[] transferBuffer = new byte[BUFFER_SIZE];
+ try (BufferedInputStream requestBufInStream =
+ new BufferedInputStream(req.getInputStream(), BUFFER_SIZE);) {
+ while ((numBytesRead =
requestBufInStream.read(transferBuffer)) != -1) {
+ randAccessContentFile.write(transferBuffer, 0,
numBytesRead);
+ }
}
- randAccessContentFile.close();
}
return contentFile;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
