From 4e687594a1d8d6c4e501556b528e21f3ac605f05 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Fri, 4 Oct 2002 12:43:46 +0000
Subject: [PATCH] <manifest> could miss situations in which an update was
 necessary.

PR: 12440
Submitted by:	Thomas Zimber <tzimber at e2e.ch>


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273405 13f79535-47bb-0310-9956-ffa450edef68
---
 WHATSNEW                                      |  3 +++
 src/etc/testcases/taskdefs/manifest.xml       | 12 ++++++++++
 .../apache/tools/ant/taskdefs/Manifest.java   | 22 +++++++++++++++++--
 .../tools/ant/taskdefs/ManifestTest.java      |  7 ++++++
 4 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/WHATSNEW b/WHATSNEW
index d2618c8d7..b66f15f81 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -19,6 +19,9 @@ Fixed bugs:
 
 * <property environment=... /> now works on OS/400.
 
+* <manifest> wouldn't update an existing manifest if only an attribute
+  of an existing section changed.
+
 Other changes:
 --------------
 
diff --git a/src/etc/testcases/taskdefs/manifest.xml b/src/etc/testcases/taskdefs/manifest.xml
index 5d5933dba..4c86fcada 100644
--- a/src/etc/testcases/taskdefs/manifest.xml
+++ b/src/etc/testcases/taskdefs/manifest.xml
@@ -188,6 +188,18 @@
     <manifest file="mftest.mf" mode="update">
       <attribute name="Foo" value="Bar" />
     </manifest>
+
+    <copy file="manifests/test2.mf" toFile="mftest2.mf" />
+    <manifest file="mftest2.mf" mode="update">
+      <section name="Test">
+        <attribute name="Foo" value="Bar" />
+      </section>
+    </manifest>
+    <manifest file="mftest2.mf" mode="update">
+      <section name="Test">
+        <attribute name="Foo" value="Baz" />
+      </section>
+    </manifest>
   </target>
 
   <target name="clean">
diff --git a/src/main/org/apache/tools/ant/taskdefs/Manifest.java b/src/main/org/apache/tools/ant/taskdefs/Manifest.java
index 97731c722..c091a0816 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Manifest.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Manifest.java
@@ -625,6 +625,24 @@ public class Manifest {
             return null;
         }
 
+        /**
+         * Clone this section
+         *
+         * @since Ant 1.5.2
+         */
+        public Object clone() {
+            Section cloned = new Section();
+            cloned.setName(name);
+            Enumeration e = getAttributeKeys();
+            while (e.hasMoreElements()) {
+                String key = (String) e.nextElement();
+                Attribute attribute = getAttribute(key);
+                cloned.storeAttribute(new Attribute(attribute.getName(), 
+                                                    attribute.getValue()));
+            }
+            return cloned;
+        }
+
         /**
          * Store an attribute and update the index.
          *
@@ -841,7 +859,7 @@ public class Manifest {
          throws ManifestException {
         if (other != null) {
              if (overwriteMain) {
-                 mainSection = other.mainSection;
+                 mainSection = (Section) other.mainSection.clone();
              } else {
                  mainSection.merge(other.mainSection);
              }
@@ -858,7 +876,7 @@ public class Manifest {
                     = (Section) other.sections.get(sectionName);
                  if (ourSection == null) {
                      if (otherSection != null) {
-                         addConfiguredSection(otherSection);
+                         addConfiguredSection((Section) otherSection.clone());
                      }
                  } else {
                      ourSection.merge(otherSection);
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/ManifestTest.java b/src/testcases/org/apache/tools/ant/taskdefs/ManifestTest.java
index 24c7a7925..7c04c7853 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/ManifestTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/ManifestTest.java
@@ -315,6 +315,13 @@ public class ManifestTest extends BuildFileTest {
         assertNotNull(mfAsString);
         assertTrue(mfAsString.startsWith("Manifest-Version: 2.0"));
         assertTrue(mfAsString.indexOf("Foo: Bar") > -1);
+
+        mf = getManifest("src/etc/testcases/taskdefs/mftest2.mf");
+        assertNotNull(mf);
+        mfAsString = mf.toString();
+        assertNotNull(mfAsString);
+        assertEquals(-1, mfAsString.indexOf("Foo: Bar"));
+        assertTrue(mfAsString.indexOf("Foo: Baz") > -1);
     }
 
     /**