Author: markt
Date: Sat Dec 31 05:09:39 2005
New Revision: 360276
URL: http://svn.apache.org/viewcvs?rev=360276&view=rev
Log:
Code clean up
Modified:
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/loader/StandardClassLoader.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/loader/WebappLoader.java
Modified:
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/loader/StandardClassLoader.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/loader/StandardClassLoader.java?rev=360276&r1=360275&r2=360276&view=diff
==============================================================================
---
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/loader/StandardClassLoader.java
(original)
+++
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/loader/StandardClassLoader.java
Sat Dec 31 05:09:39 2005
@@ -38,7 +38,6 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.jar.JarFile;
-import java.util.jar.JarEntry;
import java.util.jar.JarInputStream;
import java.util.jar.Manifest;
import org.apache.naming.JndiPermission;
Modified:
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/loader/WebappLoader.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/loader/WebappLoader.java?rev=360276&r1=360275&r2=360276&view=diff
==============================================================================
---
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/loader/WebappLoader.java
(original)
+++
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/loader/WebappLoader.java
Sat Dec 31 05:09:39 2005
@@ -996,10 +996,10 @@
// Looking up directory /WEB-INF/lib in the context
try {
- NamingEnumeration enum = resources.listBindings(libPath);
- while (enum.hasMoreElements()) {
+ NamingEnumeration enumeration =
resources.listBindings(libPath);
+ while (enumeration.hasMoreElements()) {
- Binding binding = (Binding) enum.nextElement();
+ Binding binding = (Binding) enumeration.nextElement();
String filename = libPath + "/" + binding.getName();
if (!filename.endsWith(".jar"))
continue;
@@ -1096,10 +1096,10 @@
try {
- NamingEnumeration enum = srcDir.list("");
- while (enum.hasMoreElements()) {
+ NamingEnumeration enumeration = srcDir.list("");
+ while (enumeration.hasMoreElements()) {
NameClassPair ncPair =
- (NameClassPair) enum.nextElement();
+ (NameClassPair) enumeration.nextElement();
String name = ncPair.getName();
Object object = srcDir.lookup(name);
File currentFile = new File(destDir, name);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
