From: remm <remm@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 8 Mar 2007 16:02:35 +0000 (+0000)
Subject: - 41790: close file stream.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=fa227ab284ca97d86255ff3bb920b9be74f89af4;p=tomcat7.0

- 41790: close file stream.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@516086 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java b/java/org/apache/jasper/compiler/JDTCompiler.java
index 6aa13e27d..8d960b72d 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -99,11 +99,11 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler {
             
             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 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler {
                     }
                 } catch (IOException e) {
                     log.error("Compilation error", e);
+                } finally {
+                    if (is != null) {
+                        try {
+                            is.close();
+                        } catch (IOException exc) {
+                            // Ignore
+                        }
+                    }
                 }
                 return result;
             }