bodewig 2003/10/14 05:27:33
Modified: src/main/org/apache/tools/ant/taskdefs/optional/extension
Tag: ANT_16_BRANCH ExtensionUtil.java
Log:
Merge from HEAD
Revision Changes Path
No revision
No revision
1.4.2.1 +7 -3
ant/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionUtil.java
Index: ExtensionUtil.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionUtil.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- ExtensionUtil.java 9 Jul 2003 11:24:31 -0000 1.4
+++ ExtensionUtil.java 14 Oct 2003 12:27:33 -0000 1.4.2.1
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2002 The Apache Software Foundation. All rights
+ * Copyright (c) 2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -238,7 +238,11 @@
throws BuildException {
try {
final JarFile jarFile = new JarFile(file);
- return jarFile.getManifest();
+ Manifest m = jarFile.getManifest();
+ if (m == null) {
+ throw new BuildException(file + " doesn't have a MANIFEST");
+ }
+ return m;
} catch (final IOException ioe) {
throw new BuildException(ioe.getMessage(), ioe);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
