craigmcc 01/04/02 16:43:37
Modified: catalina/src/share/org/apache/catalina/loader Extension.java
Log:
Do not throw a NullPointerException if a JAR file is missing a manifest.
Revision Changes Path
1.2 +5 -3
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/Extension.java
Index: Extension.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/Extension.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Extension.java 2000/09/29 20:44:07 1.1
+++ Extension.java 2001/04/02 23:43:35 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/Extension.java,v
1.1 2000/09/29 20:44:07 craigmcc Exp $
- * $Revision: 1.1 $
- * $Date: 2000/09/29 20:44:07 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/Extension.java,v
1.2 2001/04/02 23:43:35 craigmcc Exp $
+ * $Revision: 1.2 $
+ * $Date: 2001/04/02 23:43:35 $
*
* ====================================================================
*
@@ -91,7 +91,7 @@
* <code>guide/extensions/versioning.html</code>.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.1 $ $Date: 2000/09/29 20:44:07 $
+ * @version $Revision: 1.2 $ $Date: 2001/04/02 23:43:35 $
*/
public final class Extension {
@@ -295,6 +295,8 @@
public static List getAvailable(Manifest manifest) {
ArrayList results = new ArrayList();
+ if (manifest == null)
+ return (results);
Extension extension = null;
Attributes attributes = manifest.getMainAttributes();
