Author: remm
Date: Thu Mar 8 08:02:35 2007
New Revision: 516086
URL: http://svn.apache.org/viewvc?view=rev&rev=516086
Log:
- 41790: close file stream.
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JDTCompiler.java
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JDTCompiler.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JDTCompiler.java?view=diff&rev=516086&r1=516085&r2=516086
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JDTCompiler.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JDTCompiler.java Thu
Mar 8 08:02:35 2007
@@ -99,11 +99,11 @@
public char[] getContents() {
char[] result = null;
+ FileInputStream is = null;
try {
- InputStreamReader isReader =
- new InputStreamReader(new FileInputStream(sourceFile),
- ctxt.getOptions().getJavaEncoding());
- Reader reader = new BufferedReader(isReader);
+ is = new FileInputStream(sourceFile);
+ Reader reader =
+ new BufferedReader(new InputStreamReader(is,
ctxt.getOptions().getJavaEncoding()));
if (reader != null) {
char[] chars = new char[8192];
StringBuffer buf = new StringBuffer();
@@ -117,6 +117,14 @@
}
} catch (IOException e) {
log.error("Compilation error", e);
+ } finally {
+ if (is != null) {
+ try {
+ is.close();
+ } catch (IOException exc) {
+ // Ignore
+ }
+ }
}
return result;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
