remm 2004/04/16 04:01:11
Modified: catalina/src/share/org/apache/catalina/util
ExtensionValidator.java
Log:
- Avoid NPE if there are no extensions.
Revision Changes Path
1.12 +2 -6
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/util/ExtensionValidator.java
Index: ExtensionValidator.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/util/ExtensionValidator.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ExtensionValidator.java 10 Apr 2004 23:39:40 -0000 1.11
+++ ExtensionValidator.java 16 Apr 2004 11:01:11 -0000 1.12
@@ -63,7 +63,7 @@
StringManager.getManager("org.apache.catalina.util");
private static HashMap containerAvailableExtensions = null;
- private static ArrayList containerManifestResources = null;
+ private static ArrayList containerManifestResources = new ArrayList();
private static ResourceBundle messages = null;
@@ -209,16 +209,12 @@
* @param jarFile The system JAR whose manifest to add
*/
public static void addSystemResource(File jarFile) throws IOException {
-
Manifest manifest = getManifest(new FileInputStream(jarFile));
if (manifest != null) {
ManifestResource mre
= new ManifestResource(jarFile.getAbsolutePath(),
manifest,
ManifestResource.SYSTEM);
- if (containerManifestResources == null) {
- containerManifestResources = new ArrayList();
- }
containerManifestResources.add(mre);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
