svn commit: r1349021 - /cxf/branches/2.6.x-fixes/bin/DoMerges.java

[dkulp]

Author: dkulp
Date: Mon Jun 11 21:24:55 2012
New Revision: 1349021

URL: http://svn.apache.org/viewvc?rev=1349021&view=rev
Log:
Merged revisions 1348866 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1348866 | dkulp | 2012-06-11 10:30:07 -0400 (Mon, 11 Jun 2012) | 2 lines

  Handle multi-line props

........

Modified:
    cxf/branches/2.6.x-fixes/bin/DoMerges.java

Modified: cxf/branches/2.6.x-fixes/bin/DoMerges.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/bin/DoMerges.java?rev=1349021&r1=1349020&r2=1349021&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/bin/DoMerges.java (original)
+++ cxf/branches/2.6.x-fixes/bin/DoMerges.java Mon Jun 11 21:24:55 2012
@@ -260,7 +260,9 @@ public class DoMerges {
         line = reader.readLine();
         while (line != null) {
             int idx = line.indexOf(':');
-            parseRevs(line.substring(idx + 1), blocked);
+            if (idx != -1) {
+                parseRevs(line.substring(idx + 1).trim(), blocked);
+            }
             line = reader.readLine();
         } 
         p.waitFor();