You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2010/07/23 12:19:32 UTC
svn commit: r967021 - in /tomcat/trunk/java/org/apache/naming/resources:
BaseDirContext.java LocalStrings.properties
Author: markt
Date: Fri Jul 23 10:19:32 2010
New Revision: 967021
URL: http://svn.apache.org/viewvc?rev=967021&view=rev
Log:
Code clean-up. Fix Eclipse warnings. Implement TODOs.
Modified:
tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java
tomcat/trunk/java/org/apache/naming/resources/LocalStrings.properties
Modified: tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java?rev=967021&r1=967020&r2=967021&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java (original)
+++ tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java Fri Jul 23 10:19:32 2010
@@ -61,9 +61,6 @@ public abstract class BaseDirContext imp
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 imp
* 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 imp
*/
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);
}
Modified: tomcat/trunk/java/org/apache/naming/resources/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/LocalStrings.properties?rev=967021&r1=967020&r2=967021&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/resources/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/naming/resources/LocalStrings.properties Fri Jul 23 10:19:32 2010
@@ -18,6 +18,7 @@ fileResources.listingNull=Could not get
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}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org