remm 01/04/21 00:02:21
Modified: catalina/src/share/org/apache/catalina/loader
StandardClassLoader.java
Log:
- Manifest could be null, which raised a NPE. The fix I had put in before was
incorrect.
Bug reported by Sun-Gu Park and Donnchadh Donnabhn
Revision Changes Path
1.14 +14 -12
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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- StandardClassLoader.java 2001/04/07 23:08:45 1.13
+++ StandardClassLoader.java 2001/04/21 07:02:20 1.14
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/StandardClassLoader.java,v
1.13 2001/04/07 23:08:45 craigmcc Exp $
- * $Revision: 1.13 $
- * $Date: 2001/04/07 23:08:45 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/StandardClassLoader.java,v
1.14 2001/04/21 07:02:20 remm Exp $
+ * $Revision: 1.14 $
+ * $Date: 2001/04/21 07:02:20 $
*
* ====================================================================
*
@@ -110,7 +110,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.13 $ $Date: 2001/04/07 23:08:45 $
+ * @version $Revision: 1.14 $ $Date: 2001/04/21 07:02:20 $
*/
public class StandardClassLoader
@@ -1169,14 +1169,16 @@
if (!((manifest == null) && (jarFile == null))) {
if ((manifest == null) && (jarFile != null))
manifest = jarFile.getManifest();
- Iterator extensions =
- Extension.getAvailable(manifest).iterator();
- while (extensions.hasNext())
- available.add(extensions.next());
- extensions =
- Extension.getRequired(manifest).iterator();
- while (extensions.hasNext())
- required.add(extensions.next());
+ if (manifest != null) {
+ Iterator extensions =
+ Extension.getAvailable(manifest).iterator();
+ while (extensions.hasNext())
+ available.add(extensions.next());
+ extensions =
+ Extension.getRequired(manifest).iterator();
+ while (extensions.hasNext())
+ required.add(extensions.next());
+ }
}
if (jarFile != null)
jarFile.close();
