Author: violetagg
Date: Tue Dec 22 07:23:03 2015
New Revision: 1721311
URL: http://svn.apache.org/viewvc?rev=1721311&view=rev
Log:
Close streams
Modified:
tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java
tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
tomcat/trunk/java/org/apache/jasper/compiler/JDTCompiler.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=1721311&r1=1721310&r2=1721311&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:23:03 2015
@@ -231,19 +231,20 @@ public abstract class AbstractCatalinaTa
// Send the request data (if any)
if (istream != null) {
- BufferedOutputStream ostream =
- new BufferedOutputStream(hconn.getOutputStream(), 1024);
- byte buffer[] = new byte[1024];
- while (true) {
- int n = istream.read(buffer);
- if (n < 0) {
- break;
+ try (BufferedOutputStream ostream =
+ new BufferedOutputStream(hconn.getOutputStream(),
1024);) {
+ byte buffer[] = new byte[1024];
+ while (true) {
+ int n = istream.read(buffer);
+ if (n < 0) {
+ break;
+ }
+ ostream.write(buffer, 0, n);
}
- ostream.write(buffer, 0, n);
+ ostream.flush();
+ } finally {
+ istream.close();
}
- ostream.flush();
- ostream.close();
- istream.close();
}
// Process the response message
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=1721311&r1=1721310&r2=1721311&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:23:03 2015
@@ -569,17 +569,17 @@ public class DefaultServlet extends Http
// Copy data in oldRevisionContent to contentFile
if (oldResource.isFile()) {
- BufferedInputStream bufOldRevStream =
+ try (BufferedInputStream bufOldRevStream =
new BufferedInputStream(oldResource.getInputStream(),
- BUFFER_SIZE);
+ BUFFER_SIZE);) {
- int numBytesRead;
- byte[] copyBuffer = new byte[BUFFER_SIZE];
- while ((numBytesRead = bufOldRevStream.read(copyBuffer)) != -1) {
- randAccessContentFile.write(copyBuffer, 0, numBytesRead);
- }
+ int numBytesRead;
+ byte[] copyBuffer = new byte[BUFFER_SIZE];
+ while ((numBytesRead = bufOldRevStream.read(copyBuffer)) !=
-1) {
+ randAccessContentFile.write(copyBuffer, 0, numBytesRead);
+ }
- bufOldRevStream.close();
+ }
}
randAccessContentFile.setLength(range.length);
@@ -588,13 +588,13 @@ public class DefaultServlet extends Http
randAccessContentFile.seek(range.start);
int numBytesRead;
byte[] transferBuffer = new byte[BUFFER_SIZE];
- BufferedInputStream requestBufInStream =
- new BufferedInputStream(req.getInputStream(), BUFFER_SIZE);
- while ((numBytesRead = requestBufInStream.read(transferBuffer)) != -1)
{
- randAccessContentFile.write(transferBuffer, 0, numBytesRead);
+ try (BufferedInputStream requestBufInStream =
+ new BufferedInputStream(req.getInputStream(), BUFFER_SIZE);) {
+ while ((numBytesRead = requestBufInStream.read(transferBuffer)) !=
-1) {
+ randAccessContentFile.write(transferBuffer, 0, numBytesRead);
+ }
+ randAccessContentFile.close();
}
- randAccessContentFile.close();
- requestBufInStream.close();
return contentFile;
}
Modified: tomcat/trunk/java/org/apache/jasper/compiler/JDTCompiler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JDTCompiler.java?rev=1721311&r1=1721310&r2=1721311&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/JDTCompiler.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/JDTCompiler.java Tue Dec 22
07:23:03 2015
@@ -418,12 +418,11 @@ public class JDTCompiler extends org.apa
}
byte[] bytes = classFile.getBytes();
classFileName.append(".class");
- FileOutputStream fout =
- new
FileOutputStream(classFileName.toString());
- BufferedOutputStream bos =
- new BufferedOutputStream(fout);
- bos.write(bytes);
- bos.close();
+ try (FileOutputStream fout = new
FileOutputStream(
+ classFileName.toString());
+ BufferedOutputStream bos = new
BufferedOutputStream(fout);) {
+ bos.write(bytes);
+ }
}
}
} catch (IOException exc) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
