From 8917f3d0ae44d28256a9baa1c34d2ea81da363a4 Mon Sep 17 00:00:00 2001
From: pero <pero@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 8 May 2009 07:40:59 +0000
Subject: [PATCH] close stream after error

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@772872 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/catalina/loader/LocalStrings.properties |  1 +
 java/org/apache/catalina/loader/WebappClassLoader.java  | 11 +++++------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/java/org/apache/catalina/loader/LocalStrings.properties b/java/org/apache/catalina/loader/LocalStrings.properties
index 89489813d..2ac41a5b3 100644
--- a/java/org/apache/catalina/loader/LocalStrings.properties
+++ b/java/org/apache/catalina/loader/LocalStrings.properties
@@ -29,6 +29,7 @@ standardLoader.removeRepository=Removing repository {0}
 standardLoader.starting=Starting this Loader
 standardLoader.stopping=Stopping this Loader
 webappClassLoader.stopped=Illegal access: this web application instance has been stopped already.  Could not load {0}.  The eventual following stack trace is caused by an error thrown for debugging purposes as well as to attempt to terminate the thread which caused the illegal access, and has no functional impact.
+webappClassLoader.readError=Resource read error: Could not load {0}.
 webappClassLoader.wrongVersion=(unable to load class {0})
 webappLoader.addRepository=Adding repository {0}
 webappLoader.deploy=Deploying class repositories to work directory {0}
diff --git a/java/org/apache/catalina/loader/WebappClassLoader.java b/java/org/apache/catalina/loader/WebappClassLoader.java
index 4e8b8bfd9..1a48c75c7 100644
--- a/java/org/apache/catalina/loader/WebappClassLoader.java
+++ b/java/org/apache/catalina/loader/WebappClassLoader.java
@@ -2097,15 +2097,14 @@ public class WebappClassLoader
                             break;
                         pos += n;
                     }
-                    binaryStream.close();
                 } catch (IOException e) {
-                    e.printStackTrace();
-                    return null;
-                } catch (Exception e) {
-                    e.printStackTrace();
+                    log.error(sm.getString("webappClassLoader.readError", name), e);
                     return null;
+                } finally {
+                    try {
+                        binaryStream.close();
+                    } catch (IOException e) {}
                 }
-
                 if (fileNeedConvert) {
                     String str = new String(binaryContent,0,pos);
                     try {
-- 
2.11.0