From 078413c6f842546552158fb591e6d53b91c01661 Mon Sep 17 00:00:00 2001 From: markt Date: Fri, 23 Jul 2010 10:35:20 +0000 Subject: [PATCH] Revert part of previous clean-up. Jar needs to remain open git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@967026 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/naming/resources/BaseDirContext.java | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/java/org/apache/naming/resources/BaseDirContext.java b/java/org/apache/naming/resources/BaseDirContext.java index 1cd892352..fc7d97552 100644 --- a/java/org/apache/naming/resources/BaseDirContext.java +++ b/java/org/apache/naming/resources/BaseDirContext.java @@ -154,10 +154,9 @@ public abstract class BaseDirContext implements DirContext { * a requested resource can not be found in the main context. */ public void addResourcesJar(URL url) { - JarFile jarFile = null; try { JarURLConnection conn = (JarURLConnection) url.openConnection(); - jarFile = conn.getJarFile(); + JarFile jarFile = conn.getJarFile(); ZipEntry entry = jarFile.getEntry("/"); WARDirContext warDirContext = new WARDirContext(jarFile, new WARDirContext.Entry("/", entry)); @@ -165,14 +164,6 @@ public abstract class BaseDirContext implements DirContext { altDirContexts.add(warDirContext); } catch (IOException ioe) { log.warn(sm.getString("resources.addResourcesJarFail", url), ioe); - } finally { - if (jarFile != null) { - try { - jarFile.close(); - } catch (IOException e) { - // Ignore - } - } } } -- 2.11.0