Author: dkulp
Date: Thu Feb 16 17:44:00 2012
New Revision: 1245096
URL: http://svn.apache.org/viewvc?rev=1245096&view=rev
Log:
Fix changes and flush that were not re-asking about the current commit
Modified:
cxf/trunk/bin/DoMerges.java
Modified: cxf/trunk/bin/DoMerges.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/bin/DoMerges.java?rev=1245096&r1=1245095&r2=1245096&view=diff
==============================================================================
--- cxf/trunk/bin/DoMerges.java (original)
+++ cxf/trunk/bin/DoMerges.java Thu Feb 16 17:44:00 2012
@@ -688,11 +688,11 @@ public class DoMerges {
Set<Integer> ignores = new TreeSet<Integer>();
Set<String> jiras = new TreeSet<String>();
- int cur = 0;
- for (Integer ver : verList) {
- cur++;
+ Integer verArray[] = verList.toArray(new Integer[verList.size()]);
+ for (int cur = 0; cur < verArray.length; cur++) {
jiras.clear();
- System.out.println("Merging: " + ver + " (" + cur + "/" +
verList.size() + ")");
+ int ver = verArray[cur];
+ System.out.println("Merging: " + ver + " (" + (cur + 1) + "/" +
verList.size() + ")");
System.out.println("http://svn.apache.org/viewvc?view=revision&revision=" +
ver);
String log = getLog(ver, jiras);