umagesh 02/05/15 13:06:30
Modified: src/main/org/apache/tools/ant/taskdefs Tag: ANT_15_BRANCH
Jar.java
Log:
Revert changes to keep JarInputStream happy. Need to investigate better way
to merge manifests - Brian??
Revision Changes Path
No revision
No revision
1.51.2.2 +5 -6
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Jar.java
Index: Jar.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Jar.java,v
retrieving revision 1.51.2.1
retrieving revision 1.51.2.2
diff -u -r1.51.2.1 -r1.51.2.2
--- Jar.java 8 May 2002 22:27:46 -0000 1.51.2.1
+++ Jar.java 15 May 2002 20:06:30 -0000 1.51.2.2
@@ -223,11 +223,6 @@
protected void initZipOutputStream(ZipOutputStream zOut)
throws IOException, BuildException {
- super.initZipOutputStream(zOut);
- }
-
- protected void finalizeZipOutputStream(ZipOutputStream zOut)
- throws IOException, BuildException {
String ls = System.getProperty("line.separator");
try {
@@ -278,13 +273,17 @@
new ByteArrayInputStream(baos.toByteArray());
super.zipFile(bais, zOut, "META-INF/MANIFEST.MF",
System.currentTimeMillis(), null);
- super.finalizeZipOutputStream(zOut);
+ super.initZipOutputStream(zOut);
} catch (ManifestException e) {
log("Manifest is invalid: " + e.getMessage(), Project.MSG_ERR);
throw new BuildException("Invalid Manifest", e, getLocation());
} finally {
System.getProperties().put("line.separator", ls);
}
+ }
+
+ protected void finalizeZipOutputStream(ZipOutputStream zOut)
+ throws IOException, BuildException {
if (index) {
createIndexList(zOut);
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
