commit 6961f8a209ff1903fc87eb98163ced965356a05c
author Josh Tynjala <joshtynjala@apache.org> Fri May 15 16:06:31 2015 -0700
committer Josh Tynjala <joshtynjala@apache.org> Fri May 15 16:06:31 2015 -0700
tree 4ab89cc2557b772ed2cbe93e940514a4be8bf823
parent 2badd7431d85e35ffd4933bc82a37a7114c8ed7d

AntOnAIR: fixed issue in Replace task where if the token was replaced with a value that contained the token, the task could get stuck in an infinite loop

ant_on_air/src/org/apache/flex/ant/tags/Replace.as

diff --git a/ant_on_air/src/org/apache/flex/ant/tags/Replace.as b/ant_on_air/src/org/apache/flex/ant/tags/Replace.as
index 0b7ff69..2873ee1 100644
--- a/ant_on_air/src/org/apache/flex/ant/tags/Replace.as
+++ b/ant_on_air/src/org/apache/flex/ant/tags/Replace.as
@@ -129,7 +129,7 @@
                         var firstHalf:String = s.substr(0, c);
                         var secondHalf:String = s.substr(c);
                         s = firstHalf + secondHalf.replace(tokens[i], reps[i]);
-                        cur = c + 1;
+                        cur = c + reps[i].length;
                     }
                 } while (c != -1)
             }

ant_on_air/tests/test.xml

diff --git a/ant_on_air/tests/test.xml b/ant_on_air/tests/test.xml
index 9b6cd8f..e218795 100644
--- a/ant_on_air/tests/test.xml
+++ b/ant_on_air/tests/test.xml
@@ -206,7 +206,7 @@
         </replace>
         <replace file="${basedir}/temp/custom.properties">
             <replacetoken><![CDATA[<test/>]]></replacetoken>
-            <replacevalue><![CDATA[<cdata/>]]></replacevalue>
+            <replacevalue><![CDATA[<replaced/><test/>]]></replacevalue>
         </replace>
         <loadproperties srcFile="${basedir}/temp/custom.properties" />
         <fail message="replace did not work: found somekey">
@@ -240,10 +240,10 @@
                 </not>
             </condition>
         </fail>
-        <fail message="replace did not work: did not find &lt;cdata/&gt;">
+        <fail message="replace did not work: did not find &lt;replaced/&gt;&lt;test/&gt;">
             <condition>
                 <not>
-                    <equals arg1="${xml}" arg2="&lt;cdata/&gt;" />
+                    <equals arg1="${xml}" arg2="&lt;replaced/&gt;&lt;test/&gt;" />
                 </not>
             </condition>
         </fail>