craigmcc 02/03/12 17:26:49
Modified: catalina/src/share/org/apache/catalina/core
StandardHostDeployer.java
catalina/src/share/org/apache/catalina/loader
StandardClassLoader.java
catalina/src/share/org/apache/catalina/servlets
ManagerServlet.java
Log:
Remove obsolete JAR related imports from StandardHostDeployer and
ManagerServlet. Enhance JAR handling in StandardClassLoader to close a
JAR file even if an exception occurs.
Revision Changes Path
1.7 +4 -7
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardHostDeployer.java
Index: StandardHostDeployer.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardHostDeployer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- StandardHostDeployer.java 1 Mar 2002 16:44:32 -0000 1.6
+++ StandardHostDeployer.java 13 Mar 2002 01:26:49 -0000 1.7
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardHostDeployer.java,v
1.6 2002/03/01 16:44:32 glenn Exp $
- * $Revision: 1.6 $
- * $Date: 2002/03/01 16:44:32 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardHostDeployer.java,v
1.7 2002/03/13 01:26:49 craigmcc Exp $
+ * $Revision: 1.7 $
+ * $Date: 2002/03/13 01:26:49 $
*
* ====================================================================
*
@@ -70,11 +70,8 @@
import java.io.FileOutputStream;
import java.io.InputStream;
import java.io.IOException;
-import java.net.JarURLConnection;
import java.net.URL;
import java.util.Enumeration;
-import java.util.jar.JarEntry;
-import java.util.jar.JarFile;
import org.apache.catalina.Container;
import org.apache.catalina.Context;
import org.apache.catalina.Deployer;
@@ -94,7 +91,7 @@
* <code>StandardHost</code> implementation class.</p>
*
* @author Craig R. McClanahan
- * @version $Revision: 1.6 $ $Date: 2002/03/01 16:44:32 $
+ * @version $Revision: 1.7 $ $Date: 2002/03/13 01:26:49 $
*/
public class StandardHostDeployer implements Deployer {
1.26 +11 -7
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/StandardClassLoader.java
Index: StandardClassLoader.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/StandardClassLoader.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- StandardClassLoader.java 9 Nov 2001 17:59:16 -0000 1.25
+++ StandardClassLoader.java 13 Mar 2002 01:26:49 -0000 1.26
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/StandardClassLoader.java,v
1.25 2001/11/09 17:59:16 remm Exp $
- * $Revision: 1.25 $
- * $Date: 2001/11/09 17:59:16 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/StandardClassLoader.java,v
1.26 2002/03/13 01:26:49 craigmcc Exp $
+ * $Revision: 1.26 $
+ * $Date: 2002/03/13 01:26:49 $
*
* ====================================================================
*
@@ -112,7 +112,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.25 $ $Date: 2001/11/09 17:59:16 $
+ * @version $Revision: 1.26 $ $Date: 2002/03/13 01:26:49 $
*/
public class StandardClassLoader
@@ -1063,8 +1063,8 @@
// Validate the manifest of a JAR file repository
if (!repository.endsWith(File.separator)) {
+ JarFile jarFile = null;
try {
- JarFile jarFile = null;
Manifest manifest = null;
if (repository.startsWith("jar:")) {
URL url = new URL(null, repository, streamHandler);
@@ -1104,12 +1104,16 @@
required.add(extensions.next());
}
}
- if (jarFile != null)
- jarFile.close();
} catch (Throwable t) {
t.printStackTrace();
throw new IllegalArgumentException
("addRepositoryInternal: " + t);
+ } finally {
+ if (jarFile != null) {
+ try {
+ jarFile.close();
+ } catch (Throwable t) {}
+ }
}
}
1.18 +4 -6
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/ManagerServlet.java
Index: ManagerServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/ManagerServlet.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ManagerServlet.java 12 Mar 2002 21:14:15 -0000 1.17
+++ ManagerServlet.java 13 Mar 2002 01:26:49 -0000 1.18
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/ManagerServlet.java,v
1.17 2002/03/12 21:14:15 craigmcc Exp $
- * $Revision: 1.17 $
- * $Date: 2002/03/12 21:14:15 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/ManagerServlet.java,v
1.18 2002/03/13 01:26:49 craigmcc Exp $
+ * $Revision: 1.18 $
+ * $Date: 2002/03/13 01:26:49 $
*
* ====================================================================
*
@@ -73,8 +73,6 @@
import java.io.PrintWriter;
import java.net.URL;
import java.util.Enumeration;
-import java.util.jar.JarEntry;
-import java.util.jar.JarFile;
import javax.naming.NameClassPair;
import javax.naming.NamingEnumeration;
import javax.naming.directory.DirContext;
@@ -190,7 +188,7 @@
* </ul>
*
* @author Craig R. McClanahan
- * @version $Revision: 1.17 $ $Date: 2002/03/12 21:14:15 $
+ * @version $Revision: 1.18 $ $Date: 2002/03/13 01:26:49 $
*/
public class ManagerServlet
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
