From d62fa3608af853efc0d4c6c2714dec5f4556cfc8 Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 23 Jul 2010 10:19:32 +0000
Subject: [PATCH] Code clean-up. Fix Eclipse warnings. Implement TODOs.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@967021 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/naming/resources/BaseDirContext.java | 20 ++++++++++++--------
 .../apache/naming/resources/LocalStrings.properties  |  1 +
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/java/org/apache/naming/resources/BaseDirContext.java b/java/org/apache/naming/resources/BaseDirContext.java
index cb7901b0f..1cd892352 100644
--- a/java/org/apache/naming/resources/BaseDirContext.java
+++ b/java/org/apache/naming/resources/BaseDirContext.java
@@ -61,9 +61,6 @@ public abstract class BaseDirContext implements DirContext {
     private static final org.apache.juli.logging.Log log=
         org.apache.juli.logging.LogFactory.getLog( BaseDirContext.class );
 
-    // -------------------------------------------------------------- Constants
-
-
     // ----------------------------------------------------------- Constructors
 
 
@@ -157,18 +154,25 @@ 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 jarFile = conn.getJarFile();   
+            jarFile = conn.getJarFile();   
             ZipEntry entry = jarFile.getEntry("/");
             WARDirContext warDirContext = new WARDirContext(jarFile,
                     new WARDirContext.Entry("/", entry));
             warDirContext.loadEntries();
             altDirContexts.add(warDirContext);
         } catch (IOException ioe) {
-            // TODO: Log failure
+            log.warn(sm.getString("resources.addResourcesJarFail", url), ioe);
         } finally {
-            // TODO: Clean up
+            if (jarFile != null) {
+                try {
+                    jarFile.close();
+                } catch (IOException e) {
+                    // Ignore
+                }
+            }
         }
     }
     
@@ -868,8 +872,8 @@ public abstract class BaseDirContext implements DirContext {
      */
     public Name composeName(Name name, Name prefix)
         throws NamingException {
-        prefix = (Name) prefix.clone();
-        return prefix.addAll(name);
+        Name clone = (Name) prefix.clone();
+        return clone.addAll(name);
     }
 
 
diff --git a/java/org/apache/naming/resources/LocalStrings.properties b/java/org/apache/naming/resources/LocalStrings.properties
index 4e1a37d4c..abc1843c8 100644
--- a/java/org/apache/naming/resources/LocalStrings.properties
+++ b/java/org/apache/naming/resources/LocalStrings.properties
@@ -18,6 +18,7 @@ fileResources.listingNull=Could not get dir listing for {0}
 warResources.notWar=Doc base must point to a WAR file
 warResources.invalidWar=Invalid or unreadable WAR file : {0}
 jarResources.syntax=Document base {0} must start with ''jar:'' and end with ''!/''
+resources.addResourcesJarFail=Failed to add resources jar [{0}]
 resources.alreadyStarted=Resources has already been started
 resources.connect=Cannot connect to document base {0}
 resources.input=Cannot create input stream for resource {0}
-- 
2.11.0